mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Make leaf_script mandatory when scriptpath is set in TaprootSignatureMsg

Browse Source 
This removes the default value, because there should not be a use-case
to fall back to a an empty leaf_script by default. (If there was, it
could trivially be added back)
This commit is contained in:
MarcoFalke committed 2024-07-31 09:57:42 +02:00
1 parent 4c62f4b535
commit fadf621825
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/functional/feature_taproot.py
+1 -1
View File
@@ -231,7 +231,7 @@ def default_sigmsg(ctx):
codeseppos = get(ctx, "codeseppos") codeseppos = get(ctx, "codeseppos")
leaf_ver = get(ctx, "leafversion") leaf_ver = get(ctx, "leafversion")
script = get(ctx, "script_taproot") script = get(ctx, "script_taproot")
return TaprootSignatureMsg(tx, utxos, hashtype, idx, scriptpath=True, script=script, leaf_ver=leaf_ver, codeseparator_pos=codeseppos, annex=annex) return TaprootSignatureMsg(tx, utxos, hashtype, idx, scriptpath=True, leaf_script=script, leaf_ver=leaf_ver, codeseparator_pos=codeseppos, annex=annex)
else: else:
return TaprootSignatureMsg(tx, utxos, hashtype, idx, scriptpath=False, annex=annex) return TaprootSignatureMsg(tx, utxos, hashtype, idx, scriptpath=False, annex=annex)
elif mode == "witv0": elif mode == "witv0":
test/functional/test_framework/script.py
+5 -5
View File
@@ -810,7 +810,7 @@ def BIP341_sha_sequences(txTo):
def BIP341_sha_outputs(txTo): def BIP341_sha_outputs(txTo):
return sha256(b"".join(o.serialize() for o in txTo.vout)) return sha256(b"".join(o.serialize() for o in txTo.vout))
def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index = 0, scriptpath = False, script = CScript(), codeseparator_pos = -1, annex = None, leaf_ver = LEAF_VERSION_TAPSCRIPT): def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index=0, *, scriptpath=False, leaf_script=None, codeseparator_pos=-1, annex=None, leaf_ver=LEAF_VERSION_TAPSCRIPT):
assert (len(txTo.vin) == len(spent_utxos)) assert (len(txTo.vin) == len(spent_utxos))
assert (input_index < len(txTo.vin)) assert (input_index < len(txTo.vin))
out_type = SIGHASH_ALL if hash_type == 0 else hash_type & 3 out_type = SIGHASH_ALL if hash_type == 0 else hash_type & 3
@@ -829,7 +829,7 @@ def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index = 0, scriptpat
spend_type = 0 spend_type = 0
if annex is not None: if annex is not None:
spend_type |= 1 spend_type |= 1
if (scriptpath): if scriptpath:
spend_type |= 2 spend_type |= 2
ss += bytes([spend_type]) ss += bytes([spend_type])
if in_type == SIGHASH_ANYONECANPAY: if in_type == SIGHASH_ANYONECANPAY:
@@ -846,11 +846,11 @@ def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index = 0, scriptpat
ss += sha256(txTo.vout[input_index].serialize()) ss += sha256(txTo.vout[input_index].serialize())
else: else:
ss += bytes(0 for _ in range(32)) ss += bytes(0 for _ in range(32))
if (scriptpath): if scriptpath:
ss += TaggedHash("TapLeaf", bytes([leaf_ver]) + ser_string(script)) ss += TaggedHash("TapLeaf", bytes([leaf_ver]) + ser_string(leaf_script))
ss += bytes([0]) ss += bytes([0])
ss += codeseparator_pos.to_bytes(4, "little", signed=True) ss += codeseparator_pos.to_bytes(4, "little", signed=True)
assert len(ss) == 175 - (in_type == SIGHASH_ANYONECANPAY) * 49 - (out_type != SIGHASH_ALL and out_type != SIGHASH_SINGLE) * 32 + (annex is not None) * 32 + scriptpath * 37 assert len(ss) == 175 - (in_type == SIGHASH_ANYONECANPAY) * 49 - (out_type != SIGHASH_ALL and out_type != SIGHASH_SINGLE) * 32 + (annex is not None) * 32 + scriptpath * 37
return ss return ss
def TaprootSignatureHash(*args, **kwargs): def TaprootSignatureHash(*args, **kwargs):