diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-12-24 07:56:30 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-12-24 07:56:33 +0100 |
| commit | cc592a85ea0c371f7269dbcad32857c181b657d1 (patch) | |
| tree | 33f29e551c804282e722643d921585f40f32f371 /test | |
| parent | 1be6f2dba9b79e54ffdb40ae6ac14cede61232ab (diff) | |
| parent | 812baaa1f804a8c848284759c75e5f9d19e942f8 (diff) | |
| download | bitcoin-cc592a85ea0c371f7269dbcad32857c181b657d1.tar.xz | |
Merge #20189: test: Switch to BIP341's suggested scheme for outputs without script
812baaa1f804a8c848284759c75e5f9d19e942f8 Switch to BIP341's suggested scheme for outputs without script (Pieter Wuille)
Pull request description:
BIP341 suggests using Hash<sub>TapTweak</sub>(pubkey) to derive the tweak in case of key-only outputs. The functional test framework currently uses Hash<sub>TapTweak</sub>(pubkey || 0x00...00) instead. Change this.
There is no technical reason to prefer one over the other, but in case someone looks at it for inspiration, it's better to be consistent with the BIP.
ACKs for top commit:
laanwj:
ACK 812baaa1f804a8c848284759c75e5f9d19e942f8
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/20189/commits/812baaa1f804a8c848284759c75e5f9d19e942f8
Tree-SHA512: 02576c38776ec786255f49d7edecdb1ed8a9dcf0f547d58c23099588b4c3296edf279b103a6eb80e0f07d3c5ee9743f67d152f5244fd63adc6613b004f6969ed
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/test_framework/script.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py index 26ccab3039..be0e9f24e2 100644 --- a/test/functional/test_framework/script.py +++ b/test/functional/test_framework/script.py @@ -787,7 +787,7 @@ def TaprootSignatureHash(txTo, spent_utxos, hash_type, input_index = 0, scriptpa def taproot_tree_helper(scripts): if len(scripts) == 0: - return ([], bytes(0 for _ in range(32))) + return ([], bytes()) if len(scripts) == 1: # One entry: treat as a leaf script = scripts[0] |