rpc: use anti-fee-sniping in sendall

Sjors · Sjors · commit 4bc08582024e · 2025-07-07T18:55:33.000+02:00
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
@@ -1377,7 +1377,7 @@ RPCHelpMan sendall()
                                 },
                             },
                         },
-                        {"locktime", RPCArg::Type::NUM, RPCArg::Default{0}, "Raw locktime. Non-0 value also locktime-activates inputs"},
+                        {"locktime", RPCArg::Type::NUM, RPCArg::DefaultHint{"Approximately the current height"}, "Raw locktime. Non-0 value also locktime-activates inputs"},
                         {"lock_unspents", RPCArg::Type::BOOL, RPCArg::Default{false}, "Lock selected unspent outputs"},
                         {"psbt", RPCArg::Type::BOOL,  RPCArg::DefaultHint{"automatic"}, "Always return a PSBT, implies add_to_wallet=false."},
                         {"send_max", RPCArg::Type::BOOL, RPCArg::Default{false}, "When true, only use UTXOs that can pay for their own fees to maximize the output amount. When 'false' (default), no UTXO is left behind. send_max is incompatible with providing specific inputs."},
@@ -1508,12 +1508,21 @@ RPCHelpMan sendall()
                     if (send_max && fee_rate.GetFee(output.input_bytes) > output.txout.nValue) {
                         continue;
                     }
-                    CTxIn input(output.outpoint.hash, output.outpoint.n, CScript(), rbf ? MAX_BIP125_RBF_SEQUENCE : CTxIn::SEQUENCE_FINAL);
+                    CTxIn input(output.outpoint.hash, output.outpoint.n, CScript(), rbf ? MAX_BIP125_RBF_SEQUENCE : CTxIn::MAX_SEQUENCE_NONFINAL);
                     rawTx.vin.push_back(input);
                     total_input_value += output.txout.nValue;
                 }
             }
 
+            if (!options["locktime"].isNull()) {
+                coin_control.m_locktime = options["locktime"].getInt<int>();
+                coin_control.m_use_anti_fee_sniping = false;
+            }
+
+            if (rawTx.vin.size()) {
+                MaybeDiscourageFeeSniping(*pwallet, rawTx, coin_control);
+            }
+
             std::vector<COutPoint> outpoints_spent;
             outpoints_spent.reserve(rawTx.vin.size());
 
diff --git a/test/functional/wallet_create_tx.py b/test/functional/wallet_create_tx.py
@@ -52,6 +52,12 @@ def test_anti_fee_sniping(self):
         tx = self.nodes[0].gettransaction(txid=res['txid'], verbose=True)['decoded']
         assert_equal(tx['locktime'], 0)
 
+        # sendall RPC (don't actually empty the wallet)
+        res = self.nodes[0].sendall(recipients=[self.nodes[0].getnewaddress()], add_to_wallet=False)
+        assert(res["complete"])
+        tx = self.nodes[0].decoderawtransaction(res['hex'])
+        assert_equal(tx['locktime'], 0)
+
         self.log.info('Check that anti-fee-sniping is enabled when we mine a recent block')
         self.generate(self.nodes[0], 1)
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
@@ -65,6 +71,12 @@ def test_anti_fee_sniping(self):
         tx = self.nodes[0].gettransaction(txid=res['txid'], verbose=True)['decoded']
         assert 0 < tx['locktime'] <= 201
 
+        # sendall RPC
+        res = self.nodes[0].sendall(recipients=[self.nodes[0].getnewaddress()], add_to_wallet=False)
+        assert(res["complete"])
+        tx = self.nodes[0].decoderawtransaction(res['hex'])
+        assert 0 < tx['locktime'] <= 201
+
     def test_tx_size_too_large(self):
         # More than 10kB of outputs, so that we hit -maxtxfee with a high feerate
         outputs = {self.nodes[0].getnewaddress(address_type='bech32'): 0.000025 for _ in range(400)}
diff --git a/test/functional/wallet_rescan_unconfirmed.py b/test/functional/wallet_rescan_unconfirmed.py
@@ -53,7 +53,7 @@ def run_test(self):
         # The only UTXO available to spend is tx_parent_to_reorg.
         assert_equal(len(w0_utxos), 1)
         assert_equal(w0_utxos[0]["txid"], tx_parent_to_reorg["txid"])
-        tx_child_unconfirmed_sweep = w0.sendall([ADDRESS_BCRT1_UNSPENDABLE])
+        tx_child_unconfirmed_sweep = w0.sendall([ADDRESS_BCRT1_UNSPENDABLE], locktime=0)
         assert tx_child_unconfirmed_sweep["txid"] in node.getrawmempool()
         node.syncwithvalidationinterfacequeue()
 
