highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-05-31 16:24:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#31298: rpc: combinerawtransaction now rejects unmergeable transactions

Browse Source 
6d86184a8b rpc: combinerawtransaction now rejects unmergeable transactions (Adam Andrews)

Pull request description:

  Previously, combinerawtransaction would silently return the first tx when asked to combine unrelated txs. Now, it will check tx mergeability and throws a descriptive error if tx cannot be merged.

  fixes  #25980

ACKs for top commit:
  nervana21:
    tACK 6d86184a8b
  achow101:
    ACK 6d86184a8b
  rkrux:
    ACK [6d86184](6d86184a8b)

Tree-SHA512: 5caf983c5ab618a000f40b9ad698439d3e6217ec2dc593740443f47d90f8804a895f3054dd29bbcecdb48a61992b0d0afda7ec89591d768a44918648bbb6e20d
This commit is contained in:
Ava Chow
2026-05-13 16:07:35 -07:00
parent c680cfe343 6d86184a8b
commit 9961229360
2 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/rpc/rawtransaction.cpp
View File

@@ -604,6 +604,12 @@ static RPCMethod combinerawtransaction()
{
UniValue txs = request.params[0].get_array();
// Can't merge < 2 items
if (txs.size() < 2) {
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Missing transactions. At least two transactions required.");
}
std::vector<CMutableTransaction> txVariants(txs.size());
for (unsigned int idx = 0; idx < txs.size(); idx++) {
@@ -612,8 +618,21 @@ static RPCMethod combinerawtransaction()
}
}
if (txVariants.empty()) {
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Missing transactions");
{ // Test Tx relation for mergeability. Strip scriptSigs and scriptWitnesses to facilitate txId comparison
std::vector<CMutableTransaction> tx_variants_copy(txVariants);
Txid first_txid{};
for (unsigned int k{0}; k < tx_variants_copy.size(); ++k) {
// Remove all scriptSigs and scriptWitnesses from inputs
for (CTxIn& input : tx_variants_copy[k].vin) {
input.scriptSig.clear();
input.scriptWitness.SetNull();
}
if (k == 0) {
first_txid = tx_variants_copy[k].GetHash();
} else if (first_txid != tx_variants_copy[k].GetHash()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Transaction number %d not compatible with first transaction", k+1));
}
}
}
// mergedTx will end up with all the signatures; it

36
test/functional/rpc_createmultisig.py
View File

@@ -50,6 +50,7 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
for output_type in ["bech32", "p2sh-segwit", "legacy"]:
self.do_multisig(keys, sigs, output_type)
self.test_combinerawtransaction_preconditions()
self.test_multisig_script_limit()
self.test_mixing_uncompressed_and_compressed_keys(node0)
self.test_sortedmulti_descriptors_bip67()
@@ -82,7 +83,12 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
assert_raises_rpc_error(-8, "Number of keys involved in the multisignature address creation > 20", node1.createmultisig, 16, self.pub, 'p2sh-segwit')
assert_raises_rpc_error(-8, "Number of keys involved in the multisignature address creation > 20", node1.createmultisig, 16, self.pub, 'bech32')
def do_multisig(self, nkeys, nsigs, output_type):
def test_combinerawtransaction_preconditions(self):
self.log.info('Test combinerawtransaction preconditions')
# Note that preconditions don't depend on the output type, choosing bech32
self.do_multisig(nkeys=3, nsigs=2, output_type="bech32", assert_mergeability=True)
def do_multisig(self, nkeys, nsigs, output_type, assert_mergeability=False):
node0, _node1, node2 = self.nodes
pub_keys = self.pub[0: nkeys]
priv_keys = self.priv[0: nkeys]
@@ -146,10 +152,32 @@ class RpcCreateMultiSigTest(BitcoinTestFramework):
assert_equal(rawtx2["complete"], False)
rawtx3 = node2.signrawtransactionwithkey(rawtx, [priv_keys[-1]], prevtxs)
assert_equal(rawtx3["complete"], False)
assert_raises_rpc_error(-22, "TX decode failed", node2.combinerawtransaction, [rawtx2['hex'], rawtx3['hex'] + "00"])
assert_raises_rpc_error(-22, "Missing transactions", node2.combinerawtransaction, [])
combined_rawtx = node2.combinerawtransaction([rawtx2["hex"], rawtx3["hex"]])
if assert_mergeability:
# Test boundary conditions
assert_raises_rpc_error(-22, "TX decode failed", node2.combinerawtransaction, [rawtx2['hex'], rawtx3['hex'] + "00"])
assert_raises_rpc_error(-22, "Missing transactions. At least two transactions required.", node2.combinerawtransaction, [])
assert_raises_rpc_error(-22, "Missing transactions. At least two transactions required.", node2.combinerawtransaction, [rawtx2['hex']])
out_addr2 = getnewdestination('bech32')[2]
unmergeable_transaction_args = [
([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr: outval * 2}]], {}), # similar transaction but with different amount to send
([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr: outval}]], {"version": 1}), # similar transaction but with different version
([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr: outval}]], {"locktime": 1}), # similar transaction but with different locktime
([[{"txid": tx["txid"], "vout": tx["sent_vout"]}], [{out_addr2: outval}]], {}), # similar transaction but with different output address (scriptPubKey)
([[{"txid": tx["txid"], "vout": tx["sent_vout"], "sequence": 1}], [{out_addr: outval}]], {}), # similar transaction but with different sequence number
([[{"txid": tx["txid"], "vout": tx["sent_vout"] + 1}], [{out_addr: outval}]], {}) # similar transaction but with different input vout index
]
for rpc_args, rpc_kwargs in unmergeable_transaction_args:
unrelated_tx = node2.createrawtransaction(*rpc_args, **rpc_kwargs)
assert_raises_rpc_error(-8, "Transaction number 2 not compatible with first transaction", node0.combinerawtransaction, [rawtx2['hex'], unrelated_tx])
# Accept duplicate transactions in combinerawtransaction
dupe_merged_tx = node2.combinerawtransaction([rawtx2['hex'], rawtx2['hex']])
assert_equal(rawtx2['hex'], dupe_merged_tx)
combined_rawtx = node2.combinerawtransaction([rawtx2["hex"], rawtx3["hex"]])
tx = node0.sendrawtransaction(combined_rawtx, 0)
blk = self.generate(node0, 1)[0]
assert tx in node0.getblock(blk)["tx"]