Skip to content

Commit

Permalink
Merge bitcoin#30562: PayToAnchor(P2A) followups
Browse files Browse the repository at this point in the history
2a3a242 test: check that P2A with witness data is still consensus-legal (Greg Sanders)
68bd86c test: P2A is a destination type with an address (Greg Sanders)

Pull request description:

  Followups for bitcoin#30352

  Suggestions taken:
  bitcoin#30352 (comment)
  bitcoin#30352 (comment)

ACKs for top commit:
  tdb3:
    ACK 2a3a242
  glozow:
    ACK 2a3a242
  theStack:
    ACK 2a3a242

Tree-SHA512: 5de865b2c300fa504dbdbd5879649a6fc328da052ad8bf9479e3fea0c49c516d824908a87523ec1fb30cc536bffe2e116dd523a9b66a07f81f93429e42879f14
  • Loading branch information
fanquake committed Aug 5, 2024
2 parents f0d0855 + 2a3a242 commit 1afa3c8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
17 changes: 13 additions & 4 deletions test/functional/mempool_accept.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,19 @@ def run_test(self):
maxfeerate=0,
)

# Clear witness stuffing
anchor_spend = anchor_nonempty_wit_spend
anchor_spend.wit.vtxinwit[0].scriptWitness.stack = []
anchor_spend.rehash()
# but is consensus-legal
self.generateblock(node, self.wallet.get_address(), [anchor_nonempty_wit_spend.serialize().hex()])

# Without witness elements it is standard
create_anchor_tx = self.wallet.send_to(from_node=node, scriptPubKey=PAY_TO_ANCHOR, amount=anchor_value)
self.generate(node, 1)

anchor_spend = CTransaction()
anchor_spend.vin.append(CTxIn(COutPoint(int(create_anchor_tx["txid"], 16), create_anchor_tx["sent_vout"]), b""))
anchor_spend.vout.append(CTxOut(anchor_value - int(fee*COIN), script_to_p2wsh_script(CScript([OP_TRUE]))))
anchor_spend.wit.vtxinwit.append(CTxInWitness())
# It's "segwit" but txid == wtxid since there is no witness data
assert_equal(anchor_spend.rehash(), anchor_spend.getwtxid())

self.check_mempool_result(
result_expected=[{'txid': anchor_spend.rehash(), 'allowed': True, 'vsize': anchor_spend.get_vsize(), 'fees': { 'base': Decimal('0.00000700')}}],
Expand Down
5 changes: 5 additions & 0 deletions test/functional/rpc_validateaddress.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@
"bc1p0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqzk5jj0",
"512079be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
),
# PayToAnchor(P2A)
(
"bc1pfeessrawgf",
"51024e73",
),
]


Expand Down

0 comments on commit 1afa3c8

Please sign in to comment.