diff options
author | Andrew Chow <github@achow101.com> | 2023-01-19 17:42:14 -0500 |
---|---|---|
committer | Andrew Chow <github@achow101.com> | 2023-01-19 17:51:21 -0500 |
commit | 58da1619be7ac13e686cb8bbfc2ab0f836eb3fa5 (patch) | |
tree | eb6e94362bfe30d10f0de5d6961f21738b1e6b04 /ci/test/00_setup_env_i686_multiprocess.sh | |
parent | 250598a905a7be74d4064495c22e2423e371fe8a (diff) | |
parent | dee89438b82e94474ebaa31367035f98b4636dac (diff) |
Merge bitcoin/bitcoin#25877: refactor: Do not use CScript for tapleaf scripts until the tapleaf version is known
dee89438b82e94474ebaa31367035f98b4636dac Abstract out ComputeTapbranchHash (Russell O'Connor)
8e3fc9942729716e95907008fcf36eee758c3a6a Do not use CScript for tapleaf scripts until the tapleaf version is known (Russell O'Connor)
Pull request description:
While BIP-341 calls the contents of tapleaf a "script", only in the case that the tapleaf version is `0xc0` is this script known to be a tapscript. Otherwise the tapleaf "script" is simply an uninterpreted string of bytes.
This PR corrects the issue where the type `CScript` is used prior to the tapleaf version being known to be a tapscript. This prevents `CScript` methods from erroneously being called on non-tapscript data.
A second commit abstracts out the TapBranch hash computation in the same manner that the TapLeaf computation is already abstracted. These two abstractions ensure that the TapLeaf and TapBranch tagged hashes are always constructed properly.
ACKs for top commit:
ajtowns:
ACK dee89438b82e94474ebaa31367035f98b4636dac
instagibbs:
ACK dee89438b82e94474ebaa31367035f98b4636dac
achow101:
ACK dee89438b82e94474ebaa31367035f98b4636dac
sipa:
ACK dee89438b82e94474ebaa31367035f98b4636dac
aureleoules:
reACK dee89438b82e94474ebaa31367035f98b4636dac - I verified that there is no behavior change.
Tree-SHA512: 4a1d37f3e9a1890e7f5eadcf65562688cc451389581fe6e2da0feb2368708edacdd95392578d8afff05270d88fc61dce732d83d1063d84d12cf47b5f4633ec7e
Diffstat (limited to 'ci/test/00_setup_env_i686_multiprocess.sh')
0 files changed, 0 insertions, 0 deletions