mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge 269fa667f2 into merged_master (Bitcoin PR bitcoin/bitcoin#25044)
This commit is contained in:
James Dorfman
commit
fec3aaf01a
3 changed files with 96 additions and 123 deletions
|
|
@ -23,7 +23,10 @@ from test_framework.test_framework import BitcoinTestFramework
|
|||
from test_framework.util import (
|
||||
assert_equal,
|
||||
assert_raises_rpc_error,
|
||||
find_vout_for_address,
|
||||
)
|
||||
from test_framework.wallet import (
|
||||
getnewdestination,
|
||||
MiniWallet,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -51,9 +54,8 @@ class multidict(dict):
|
|||
class RawTransactionsTest(BitcoinTestFramework):
|
||||
def set_test_params(self):
|
||||
self.setup_clean_chain = True
|
||||
self.num_nodes = 4
|
||||
self.num_nodes = 3
|
||||
self.extra_args = [
|
||||
["-txindex"],
|
||||
["-txindex"],
|
||||
["-txindex"],
|
||||
[],
|
||||
|
|
@ -61,69 +63,58 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
# whitelist all peers to speed up tx relay / mempool sync
|
||||
for args in self.extra_args:
|
||||
args.append("-whitelist=noban@127.0.0.1")
|
||||
self.requires_wallet = self.is_specified_wallet_compiled()
|
||||
|
||||
self.supports_cli = False
|
||||
|
||||
def skip_test_if_missing_module(self):
|
||||
self.skip_if_no_wallet()
|
||||
|
||||
def setup_network(self):
|
||||
super().setup_network()
|
||||
self.connect_nodes(0, 2)
|
||||
|
||||
def run_test(self):
|
||||
self.wallet = MiniWallet(self.nodes[0])
|
||||
self.log.info("Prepare some coins for multiple *rawtransaction commands")
|
||||
self.generate(self.nodes[2], 1)
|
||||
self.generate(self.wallet, 10)
|
||||
self.generate(self.nodes[0], COINBASE_MATURITY + 1)
|
||||
for amount in [1.5, 1.0, 5.0]:
|
||||
self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), amount)
|
||||
self.sync_all()
|
||||
self.generate(self.nodes[0], 5)
|
||||
|
||||
self.getrawtransaction_tests()
|
||||
self.createrawtransaction_tests()
|
||||
self.signrawtransactionwithwallet_tests()
|
||||
self.sendrawtransaction_tests()
|
||||
self.sendrawtransaction_testmempoolaccept_tests()
|
||||
self.decoderawtransaction_tests()
|
||||
self.transaction_version_number_tests()
|
||||
if not self.options.descriptors:
|
||||
if self.requires_wallet and not self.options.descriptors:
|
||||
self.raw_multisig_transaction_legacy_tests()
|
||||
|
||||
def getrawtransaction_tests(self):
|
||||
addr = self.nodes[1].getnewaddress()
|
||||
txid = self.nodes[0].sendtoaddress(addr, 10)
|
||||
tx = self.wallet.send_self_transfer(from_node=self.nodes[0])
|
||||
self.generate(self.nodes[0], 1)
|
||||
vout = find_vout_for_address(self.nodes[1], txid, addr)
|
||||
rawTx = self.nodes[1].createrawtransaction([{'txid': txid, 'vout': vout}], [{self.nodes[1].getnewaddress(): 9.999}, {"fee": 0.001}])
|
||||
rawTxSigned = self.nodes[1].signrawtransactionwithwallet(rawTx)
|
||||
txId = self.nodes[1].sendrawtransaction(rawTxSigned['hex'])
|
||||
self.generateblock(self.nodes[0], output=self.nodes[0].getnewaddress(), transactions=[rawTxSigned['hex']])
|
||||
txId = tx['txid']
|
||||
err_msg = (
|
||||
"No such mempool transaction. Use -txindex or provide a block hash to enable"
|
||||
" blockchain transaction queries. Use gettransaction for wallet transactions."
|
||||
)
|
||||
|
||||
for n in [0, 3]:
|
||||
for n in [0, 2]:
|
||||
self.log.info(f"Test getrawtransaction {'with' if n == 0 else 'without'} -txindex")
|
||||
|
||||
if n == 0:
|
||||
# With -txindex.
|
||||
# 1. valid parameters - only supply txid
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId), rawTxSigned['hex'])
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId), tx['hex'])
|
||||
|
||||
# 2. valid parameters - supply txid and 0 for non-verbose
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, 0), rawTxSigned['hex'])
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, 0), tx['hex'])
|
||||
|
||||
# 3. valid parameters - supply txid and False for non-verbose
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, False), rawTxSigned['hex'])
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, False), tx['hex'])
|
||||
|
||||
# 4. valid parameters - supply txid and 1 for verbose.
|
||||
# We only check the "hex" field of the output so we don't need to update this test every time the output format changes.
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, 1)["hex"], rawTxSigned['hex'])
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, 1)["hex"], tx['hex'])
|
||||
|
||||
# 5. valid parameters - supply txid and True for non-verbose
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, True)["hex"], rawTxSigned['hex'])
|
||||
assert_equal(self.nodes[n].getrawtransaction(txId, True)["hex"], tx['hex'])
|
||||
else:
|
||||
# Without -txindex, expect to raise.
|
||||
for verbose in [None, 0, False, 1, True]:
|
||||
|
|
@ -140,9 +131,9 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
assert_raises_rpc_error(-1, "not a boolean", self.nodes[n].getrawtransaction, txId, {})
|
||||
|
||||
# Make a tx by sending, then generate 2 blocks; block1 has the tx in it
|
||||
tx = self.nodes[2].sendtoaddress(self.nodes[1].getnewaddress(), 1)
|
||||
tx = self.wallet.send_self_transfer(from_node=self.nodes[2])['txid']
|
||||
block1, block2 = self.generate(self.nodes[2], 2)
|
||||
for n in [0, 3]:
|
||||
for n in [0, 2]:
|
||||
self.log.info(f"Test getrawtransaction {'with' if n == 0 else 'without'} -txindex, with blockhash")
|
||||
# We should be able to get the raw transaction by providing the correct block
|
||||
gottx = self.nodes[n].getrawtransaction(txid=tx, verbose=True, blockhash=block1)
|
||||
|
|
@ -201,22 +192,23 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
# sequence number out of range
|
||||
for invalid_seq in [-1, 4294967296]:
|
||||
inputs = [{'txid': TXID, 'vout': 1, 'sequence': invalid_seq}]
|
||||
outputs = [{self.nodes[0].getnewaddress(): 1}]
|
||||
address = getnewdestination()[2]
|
||||
outputs = [{address: 1}]
|
||||
assert_raises_rpc_error(-8, 'Invalid parameter, sequence number is out of range',
|
||||
self.nodes[0].createrawtransaction, inputs, outputs)
|
||||
# with valid sequence number
|
||||
for valid_seq in [1000, 4294967294]:
|
||||
inputs = [{'txid': TXID, 'vout': 1, 'sequence': valid_seq}]
|
||||
outputs = [{self.nodes[0].getnewaddress(): 1}]
|
||||
address = getnewdestination()[2]
|
||||
outputs = [{address: 1}]
|
||||
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||
decrawtx = self.nodes[0].decoderawtransaction(rawtx)
|
||||
assert_equal(decrawtx['vin'][0]['sequence'], valid_seq)
|
||||
|
||||
# Test `createrawtransaction` invalid `outputs`
|
||||
address = self.nodes[0].getnewaddress()
|
||||
address2 = self.nodes[0].getnewaddress()
|
||||
address = getnewdestination()[2]
|
||||
assert_raises_rpc_error(-3, "Expected type array, got string", self.nodes[0].createrawtransaction, [], 'foo')
|
||||
self.nodes[0].createrawtransaction(inputs=[], outputs=[])
|
||||
self.nodes[0].createrawtransaction(inputs=[], outputs=[]) # Should not throw for backwards compatibility
|
||||
assert_raises_rpc_error(-8, "Data must be hexadecimal string", self.nodes[0].createrawtransaction, [], [{'data': 'foo'}])
|
||||
assert_raises_rpc_error(-5, "Invalid Bitcoin address", self.nodes[0].createrawtransaction, [], [{'foo': 0}])
|
||||
assert_raises_rpc_error(-3, "Invalid amount", self.nodes[0].createrawtransaction, [], [{address: 'foo'}])
|
||||
|
|
@ -242,6 +234,7 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
self.nodes[2].createrawtransaction(inputs=[{'txid': TXID, 'vout': 9}], outputs=[{address: 99}]),
|
||||
)
|
||||
# Two outputs
|
||||
address2 = getnewdestination()[2]
|
||||
tx = tx_from_hex(self.nodes[2].createrawtransaction(inputs=[{'txid': TXID, 'vout': 9}], outputs=[{address: 99}, {address2: 99}]))
|
||||
assert_equal(len(tx.vout), 2)
|
||||
assert_equal(
|
||||
|
|
@ -256,123 +249,53 @@ class RawTransactionsTest(BitcoinTestFramework):
|
|||
self.nodes[2].createrawtransaction(inputs=[{'txid': TXID, 'vout': 9}], outputs=[{address: 99}, {address2: 99}, {'data': '99'}]),
|
||||
)
|
||||
|
||||
def signrawtransactionwithwallet_tests(self):
|
||||
for type in ["bech32", "p2sh-segwit", "legacy"]:
|
||||
self.log.info(f"Test signrawtransactionwithwallet with missing prevtx info ({type})")
|
||||
addr = self.nodes[0].getnewaddress("", type)
|
||||
addrinfo = self.nodes[0].getaddressinfo(addr)
|
||||
pubkey = addrinfo["scriptPubKey"]
|
||||
inputs = [{'txid': TXID, 'vout': 3, 'sequence': 1000}]
|
||||
outputs = [{self.nodes[0].getnewaddress(): 1}]
|
||||
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||
|
||||
|
||||
prevtx = dict(txid=TXID, scriptPubKey=pubkey, vout=3, amount=1)
|
||||
succ = self.nodes[0].signrawtransactionwithwallet(rawtx, [prevtx])
|
||||
assert succ["complete"]
|
||||
|
||||
if type == "legacy":
|
||||
del prevtx["amount"]
|
||||
succ = self.nodes[0].signrawtransactionwithwallet(rawtx, [prevtx])
|
||||
assert succ["complete"]
|
||||
else:
|
||||
assert_raises_rpc_error(-3, "Missing amount", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"txid": TXID,
|
||||
"scriptPubKey": pubkey,
|
||||
"vout": 3,
|
||||
}
|
||||
])
|
||||
|
||||
assert_raises_rpc_error(-3, "Missing vout", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"txid": TXID,
|
||||
"scriptPubKey": pubkey,
|
||||
"amount": 1,
|
||||
}
|
||||
])
|
||||
assert_raises_rpc_error(-3, "Missing txid", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"scriptPubKey": pubkey,
|
||||
"vout": 3,
|
||||
"amount": 1,
|
||||
}
|
||||
])
|
||||
assert_raises_rpc_error(-3, "Missing scriptPubKey", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"txid": TXID,
|
||||
"vout": 3,
|
||||
"amount": 1
|
||||
}
|
||||
])
|
||||
|
||||
def sendrawtransaction_tests(self):
|
||||
self.log.info('sendrawtransaction with missing input')
|
||||
self.log.info('Test sendrawtransaction with missing input')
|
||||
inputs = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1}] #won't exists
|
||||
outputs = [{ self.nodes[0].getnewaddress() : 4.998 }]
|
||||
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||
rawtx = self.nodes[2].signrawtransactionwithwallet(rawtx)
|
||||
assert_raises_rpc_error(-25, "bad-txns-inputs-missingorspent", self.nodes[2].sendrawtransaction, rawtx['hex'])
|
||||
address = getnewdestination()[2]
|
||||
outputs = [{address: 4.998}]
|
||||
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||
assert_raises_rpc_error(-25, "bad-txns-inputs-missingorspent", self.nodes[2].sendrawtransaction, rawtx)
|
||||
|
||||
def sendrawtransaction_testmempoolaccept_tests(self):
|
||||
self.log.info("Test sendrawtransaction/testmempoolaccept with maxfeerate")
|
||||
fee_exceeds_max = "Fee exceeds maximum configured by user (e.g. -maxtxfee, maxfeerate)"
|
||||
|
||||
# Test a transaction with a small fee.
|
||||
txId = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.0)
|
||||
rawTx = self.nodes[0].getrawtransaction(txId, True)
|
||||
vout = next(o for o in rawTx['vout'] if o['value'] == Decimal('1.00000000'))
|
||||
|
||||
self.sync_all()
|
||||
inputs = [{"txid": txId, "vout": vout['n']}]
|
||||
# Fee 10,000 satoshis, (1 - (10000 sat * 0.00000001 BTC/sat)) = 0.9999
|
||||
outputs = [{self.nodes[0].getnewaddress(): Decimal("0.99990000")}, {"fee": 0.0001}]
|
||||
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||
rawTxSigned = self.nodes[2].signrawtransactionwithwallet(rawTx)
|
||||
assert_equal(rawTxSigned['complete'], True)
|
||||
# Fee 10,000 satoshis, ~100 b transaction, fee rate should land around 100 sat/byte = 0.00100000 BTC/kB
|
||||
# Fee rate is 0.00100000 BTC/kvB
|
||||
tx = self.wallet.create_self_transfer(fee_rate=Decimal('0.00100000'))
|
||||
# Thus, testmempoolaccept should reject
|
||||
testres = self.nodes[2].testmempoolaccept([rawTxSigned['hex']], 0.00001000)[0]
|
||||
testres = self.nodes[2].testmempoolaccept([tx['hex']], 0.00001000)[0]
|
||||
assert_equal(testres['allowed'], False)
|
||||
assert_equal(testres['reject-reason'], 'max-fee-exceeded')
|
||||
# and sendrawtransaction should throw
|
||||
assert_raises_rpc_error(-25, fee_exceeds_max, self.nodes[2].sendrawtransaction, rawTxSigned['hex'], 0.00001000)
|
||||
assert_raises_rpc_error(-25, fee_exceeds_max, self.nodes[2].sendrawtransaction, tx['hex'], 0.00001000)
|
||||
# and the following calls should both succeed
|
||||
testres = self.nodes[2].testmempoolaccept(rawtxs=[rawTxSigned['hex']])[0]
|
||||
testres = self.nodes[2].testmempoolaccept(rawtxs=[tx['hex']])[0]
|
||||
assert_equal(testres['allowed'], True)
|
||||
self.nodes[2].sendrawtransaction(hexstring=rawTxSigned['hex'])
|
||||
self.nodes[2].sendrawtransaction(hexstring=tx['hex'])
|
||||
|
||||
# Test a transaction with a large fee.
|
||||
txId = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 1.0)
|
||||
rawTx = self.nodes[0].getrawtransaction(txId, True)
|
||||
vout = next(o for o in rawTx['vout'] if o['value'] == Decimal('1.00000000'))
|
||||
|
||||
self.sync_all()
|
||||
inputs = [{"txid": txId, "vout": vout['n']}]
|
||||
# Fee 2,000,000 satoshis, (1 - (2000000 sat * 0.00000001 BTC/sat)) = 0.98
|
||||
outputs = [{self.nodes[0].getnewaddress() : Decimal("0.98000000")}, {"fee": 0.02}]
|
||||
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
|
||||
rawTxSigned = self.nodes[2].signrawtransactionwithwallet(rawTx)
|
||||
assert_equal(rawTxSigned['complete'], True)
|
||||
# Fee 2,000,000 satoshis, ~100 b transaction, fee rate should land around 20,000 sat/byte = 0.20000000 BTC/kB
|
||||
# Fee rate is 0.20000000 BTC/kvB
|
||||
tx = self.wallet.create_self_transfer(mempool_valid=False, from_node=self.nodes[0], fee_rate=Decimal('0.20000000'))
|
||||
# Thus, testmempoolaccept should reject
|
||||
testres = self.nodes[2].testmempoolaccept([rawTxSigned['hex']])[0]
|
||||
testres = self.nodes[2].testmempoolaccept([tx['hex']])[0]
|
||||
assert_equal(testres['allowed'], False)
|
||||
assert_equal(testres['reject-reason'], 'max-fee-exceeded')
|
||||
# and sendrawtransaction should throw
|
||||
assert_raises_rpc_error(-25, fee_exceeds_max, self.nodes[2].sendrawtransaction, rawTxSigned['hex'])
|
||||
assert_raises_rpc_error(-25, fee_exceeds_max, self.nodes[2].sendrawtransaction, tx['hex'])
|
||||
# and the following calls should both succeed
|
||||
testres = self.nodes[2].testmempoolaccept(rawtxs=[rawTxSigned['hex']], maxfeerate='0.20000000')[0]
|
||||
testres = self.nodes[2].testmempoolaccept(rawtxs=[tx['hex']], maxfeerate='0.20000000')[0]
|
||||
assert_equal(testres['allowed'], True)
|
||||
self.nodes[2].sendrawtransaction(hexstring=rawTxSigned['hex'], maxfeerate='0.20000000')
|
||||
self.nodes[2].sendrawtransaction(hexstring=tx['hex'], maxfeerate='0.20000000')
|
||||
|
||||
self.log.info("Test sendrawtransaction/testmempoolaccept with tx already in the chain")
|
||||
self.generate(self.nodes[2], 1)
|
||||
for node in self.nodes:
|
||||
testres = node.testmempoolaccept([rawTxSigned['hex']])[0]
|
||||
testres = node.testmempoolaccept([tx['hex']])[0]
|
||||
assert_equal(testres['allowed'], False)
|
||||
assert_equal(testres['reject-reason'], 'txn-already-known')
|
||||
assert_raises_rpc_error(-27, 'Transaction already in block chain', node.sendrawtransaction, rawTxSigned['hex'])
|
||||
assert_raises_rpc_error(-27, 'Transaction already in block chain', node.sendrawtransaction, tx['hex'])
|
||||
|
||||
def decoderawtransaction_tests(self):
|
||||
self.log.info("Test decoderawtransaction")
|
||||
|
|
|
|||
|
|
@ -425,6 +425,56 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
|||
vout = [v['n'] for v in tx['vout'] if 'scriptPubKey' in v and uc_addr == v['scriptPubKey'].get('address',[])]
|
||||
assert len(vout) == 1
|
||||
|
||||
def test_signing_with_missing_prevtx_info(self):
|
||||
txid = "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000"
|
||||
for type in ["bech32", "p2sh-segwit", "legacy"]:
|
||||
self.log.info(f"Test signing with missing prevtx info ({type})")
|
||||
addr = self.nodes[0].getnewaddress("", type)
|
||||
addrinfo = self.nodes[0].getaddressinfo(addr)
|
||||
pubkey = addrinfo["scriptPubKey"]
|
||||
inputs = [{'txid': txid, 'vout': 3, 'sequence': 1000}]
|
||||
outputs = [{self.nodes[0].getnewaddress(): 1}]
|
||||
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
|
||||
|
||||
prevtx = dict(txid=txid, scriptPubKey=pubkey, vout=3, amount=1)
|
||||
succ = self.nodes[0].signrawtransactionwithwallet(rawtx, [prevtx])
|
||||
assert succ["complete"]
|
||||
|
||||
if type == "legacy":
|
||||
del prevtx["amount"]
|
||||
succ = self.nodes[0].signrawtransactionwithwallet(rawtx, [prevtx])
|
||||
assert succ["complete"]
|
||||
else:
|
||||
assert_raises_rpc_error(-3, "Missing amount", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"txid": txid,
|
||||
"scriptPubKey": pubkey,
|
||||
"vout": 3,
|
||||
}
|
||||
])
|
||||
|
||||
assert_raises_rpc_error(-3, "Missing vout", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"txid": txid,
|
||||
"scriptPubKey": pubkey,
|
||||
"amount": 1,
|
||||
}
|
||||
])
|
||||
assert_raises_rpc_error(-3, "Missing txid", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"scriptPubKey": pubkey,
|
||||
"vout": 3,
|
||||
"amount": 1,
|
||||
}
|
||||
])
|
||||
assert_raises_rpc_error(-3, "Missing scriptPubKey", self.nodes[0].signrawtransactionwithwallet, rawtx, [
|
||||
{
|
||||
"txid": txid,
|
||||
"vout": 3,
|
||||
"amount": 1
|
||||
}
|
||||
])
|
||||
|
||||
def run_test(self):
|
||||
self.nodes[0].set_deterministic_priv_key('2Mysp7FKKe52eoC2JmU46irt1dt58TpCvhQ', 'cTNbtVJmhx75RXomhYWSZAafuNNNKPd1cr2ZiUcAeukLNGrHWjvJ')
|
||||
self.nodes[0].importprivkey("cTNbtVJmhx75RXomhYWSZAafuNNNKPd1cr2ZiUcAeukLNGrHWjvJ")
|
||||
|
|
@ -437,6 +487,7 @@ class SignRawTransactionsTest(BitcoinTestFramework):
|
|||
self.test_fully_signed_tx()
|
||||
self.test_signing_with_csv()
|
||||
self.test_signing_with_cltv()
|
||||
self.test_signing_with_missing_prevtx_info()
|
||||
|
||||
# Blinded descriptors not supported yet
|
||||
if not self.options.descriptors:
|
||||
|
|
|
|||
|
|
@ -216,7 +216,6 @@ BASE_SCRIPTS = [
|
|||
'rpc_signrawtransaction.py --legacy-wallet',
|
||||
'rpc_signrawtransaction.py --descriptors',
|
||||
'rpc_rawtransaction.py --legacy-wallet',
|
||||
'rpc_rawtransaction.py --descriptors',
|
||||
'wallet_groups.py --legacy-wallet',
|
||||
'wallet_groups.py --descriptors',
|
||||
'wallet_transactiontime_rescan.py --descriptors',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue