highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-28 07:59:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32270: test: fix pushdata scripts

Browse Source 
f66b14d2ec test: fix pushdata scripts (Greg Sanders)

Pull request description:

  The original scripts were done incorrectly,
  so they are changed to represent two
  different 2-byte pushes.

  Fixes https://github.com/bitcoin/bitcoin/pull/32114#discussion_r2034051063

ACKs for top commit:
  ajtowns:
    ACK f66b14d2ec
  TheCharlatan:
    Re-ACK f66b14d2ec

Tree-SHA512: 0956124ee0d2e8b6a594f9feeb47c1f598c68e24d277e874f81a093268113e9da2c75a02863dbaab68b962063f7d910bfd10abe3ad33ec182bc21d72908f06e6
This commit is contained in:
merge-script
2025-05-27 11:59:31 +01:00
parent 638a4c0bd8 f66b14d2ec
commit 87860143be
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/feature_taproot.py
View File

@@ -1240,8 +1240,8 @@ def sample_spenders():
# Create a list of scripts which will be built into a taptree
scripts = [
# leaf label, followed by CScript
("encodeable_pushdata1", CScript([OP_DROP, OP_PUSHDATA1, b'aa' * 75])),
("nonstd_encodeable_pushdata1", CScript([OP_PUSHDATA1, b'aa'])),
("2byte_push", CScript([OP_DROP, b'\xaa\xaa'])),
("nonstd_2byte_push", CScript.fromhex("4c02aaaa")),
("dummyleaf", CScript([])),
]
@@ -1255,13 +1255,13 @@ def sample_spenders():
spenders = []
# Named comment, using first leaf from scripts, with empty string as witness data, no optional fail condition
add_spender(spenders, comment="tutorial/pushdata1", tap=tap, leaf="encodeable_pushdata1", inputs=[b'\x00'], no_fail=True)
add_spender(spenders, comment="tutorial/push", tap=tap, leaf="2byte_push", inputs=[b'\x00'], no_fail=True)
# Spender with alternative failure tapscript via over-riding "failure" dictionary, along with the failure's expected err_msg / ERR_*
add_spender(spenders, comment="tutorial/pushdata1redux", tap=tap, leaf="encodeable_pushdata1", inputs=[b'\x00'], failure={"leaf": "dummyleaf"}, **ERR_EVAL_FALSE)
add_spender(spenders, comment="tutorial/pushredux", tap=tap, leaf="2byte_push", inputs=[b'\x00'], failure={"leaf": "dummyleaf"}, **ERR_EVAL_FALSE)
# Spender that is non-standard but otherwise valid, with extraneous signature data from inner key for optional failure condition
add_spender(spenders, comment="tutorial/nonminpushdata1", tap=tap, leaf="nonstd_encodeable_pushdata1", key=secs[0], standard=False, failure={"inputs": [getter("sign")]}, **ERR_CLEANSTACK)
add_spender(spenders, comment="tutorial/nonminpush", tap=tap, leaf="nonstd_2byte_push", key=secs[0], standard=False, failure={"inputs": [getter("sign")]}, **ERR_CLEANSTACK)
# New scripts=[] can be defined, and rinse-repeated as necessary until the spenders list is returned for execution
return spenders