issue #181 preserve pre-25.0 functionality for sendrawtransaction and… (

#182) * issue #181 preserve pre-25.0 functionality for sendrawtransaction and fix one small typo (Vulberable) * make BTC version check specific to BTC --------- Co-authored-by: BamaHodl <[email protected]>
cculianu · Sep 29, 2023 · c3ee3e5 · c3ee3e5
1 parent ac5e08e
commit c3ee3e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Servers.cpp b/src/Servers.cpp
@@ -1826,7 +1826,16 @@ void Server::rpc_blockchain_transaction_broadcast(Client *c, const RPC::BatchId
     // -- filter may end up applying murmur3 hash to the entire key we give it from 20-50 times!
     const QByteArray txkey = (!rawtxhex.isEmpty() ? BTC::HashOnce(Util::ParseHexFast(rawtxhex)).left(16) : QByteArrayLiteral("xx"));
     // no need to validate hex here -- bitcoind does validation for us!
-    generic_async_to_bitcoind(c, batchId, m.id, "sendrawtransaction", QVariantList{ rawtxhex },
+    QVariantList params { rawtxhex } ;
+    if (isBTC()
+            && bitcoindmgr->getBitcoinDVersion() >= Version{0,25,0}) {
+        // bitcoin core 25.0+ requires specifying maxburnamount in sendrawtransaction call
+        // which also requires first sending maxfeerate, set to 0.1btc by default in core
+        params.append(0.1);
+        // set maxburnrate to max btc supply to preserve pre-25.0 functionality
+        params.append(21000000);
+    }
+    generic_async_to_bitcoind(c, batchId, m.id, "sendrawtransaction", params,
         // print to log, echo bitcoind's reply to client
         [size=rawtxhex.length()/2, c, this, txkey](const RPC::Message & reply){
             QVariant ret = reply.result();
@@ -1842,8 +1851,8 @@ void Server::rpc_blockchain_transaction_broadcast(Client *c, const RPC::BatchId
             logFilter->broadcast(true, logLine, txkey);
             // Next, check if client is old and has the phishing exploit:
             // version 3.3.4 was the first one that was good for both Electron Cash and Electrum
-            constexpr Version FirstNonVulberableVersion(3,3,4);
-            if (const auto uaVersion = c->info.uaVersion(); uaVersion.isValid() && uaVersion < FirstNonVulberableVersion) {
+            constexpr Version FirstNonVulnerableVersion(3,3,4);
+            if (const auto uaVersion = c->info.uaVersion(); uaVersion.isValid() && uaVersion < FirstNonVulnerableVersion) {
                 // The below is to warn old clients that they are vulnerable to a phishing attack.
                 // This logic is also used by the ElectronX implementations here:
                 // https://github.com/Electron-Cash/electrumx/blob/fbd00416d804c286eb7de856e9399efb07a2ceaf/electrumx/server/session.py#L1526

diff --git a/src/Servers.h b/src/Servers.h
@@ -313,6 +313,7 @@ protected slots:
     /// If true we are on the BTC or LTC chains.
     bool isNonBCH() const { return coin != BTC::Coin::BCH; }
     bool isLTC() const { return coin == BTC::Coin::LTC; }
+    bool isBTC() const { return coin == BTC::Coin::BTC; }
 
 
     // --- Helpers used by Server* and AdminServer subclasses ---