mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-03 18:29:21 +02:00
test: refactor: return TaprootInfo from P2TR address creation routine
Rather than only returning the internal key from the P2TR anyone-can-spend address creation routine, provide the whole TaprootInfo object, which in turn contains a dictionary of TaprootLeafInfo object for named leaves. This data is used in MiniWallet for the default ADDRESS_OP_TRUE mode, in order to deduplicate the witness script and leaf version of the control block.
This commit is contained in:
@@ -39,7 +39,6 @@ from test_framework.messages import (
|
||||
)
|
||||
from test_framework.script import (
|
||||
CScript,
|
||||
LEAF_VERSION_TAPSCRIPT,
|
||||
OP_1,
|
||||
OP_NOP,
|
||||
OP_RETURN,
|
||||
@@ -107,7 +106,7 @@ class MiniWallet:
|
||||
self._scriptPubKey = key_to_p2pk_script(pub_key.get_bytes())
|
||||
elif mode == MiniWalletMode.ADDRESS_OP_TRUE:
|
||||
internal_key = None if tag_name is None else hash256(tag_name.encode())
|
||||
self._address, self._internal_key = create_deterministic_address_bcrt1_p2tr_op_true(internal_key)
|
||||
self._address, self._taproot_info = create_deterministic_address_bcrt1_p2tr_op_true(internal_key)
|
||||
self._scriptPubKey = address_to_scriptpubkey(self._address)
|
||||
|
||||
# When the pre-mined test framework chain is used, it contains coinbase
|
||||
@@ -195,7 +194,12 @@ class MiniWallet:
|
||||
elif self._mode == MiniWalletMode.ADDRESS_OP_TRUE:
|
||||
tx.wit.vtxinwit = [CTxInWitness()] * len(tx.vin)
|
||||
for i in tx.wit.vtxinwit:
|
||||
i.scriptWitness.stack = [CScript([OP_TRUE]), bytes([LEAF_VERSION_TAPSCRIPT]) + self._internal_key]
|
||||
assert_equal(len(self._taproot_info.leaves), 1)
|
||||
leaf_info = list(self._taproot_info.leaves.values())[0]
|
||||
i.scriptWitness.stack = [
|
||||
leaf_info.script,
|
||||
bytes([leaf_info.version]) + self._taproot_info.internal_pubkey,
|
||||
]
|
||||
else:
|
||||
assert False
|
||||
|
||||
|
||||
Reference in New Issue
Block a user