BIP360 P2MR for Quantum-Resistance Migration: Validation, Policy, and Functional Tests #35106

Summary

• add BIP360 P2MR script/type/policy plumbing
• add witness-v2 P2MR functional coverage
• fix P2MR control-path merkle parsing in the interpreter

Key Changes

• script/interpreter: P2MR commitment verification path for witness v2
• policy: standardness and mempool input checks for P2MR spends
• solver/sign/rpc/wallet wiring for the new script type
• tests: unit updates plus feature_p2mr.py registered in functional test runner

Validation

• ctest --output-on-failure -j6 (pass)
• focused functional tests (pass):
  • feature_p2mr.py
  • feature_taproot.py
  • mempool_accept.py
  • mempool_packages.py
  • mempool_package_limits.py
• test_runner.py --extended --jobs=6 (pass; environment-dependent skips only)
• previously skipped actionable tests now enabled and passed:
  • tool_bench_sanity_check.py
  • tool_bitcoin_chainstate.py
  • wallet_backwards_compatibility.py
  • wallet_migration.py
  • mempool_compatibility.py
  • feature_coinstatsindex_compatibility.py
  • feature_unsupported_utxo_db.py

♻️ Automatically closing for now based on heuristics. Please leave a comment, if this was erroneous. Generally, please focus on creating high-quality, original content that demonstrates a clear understanding of the project's requirements and goals.

📝 Moderators: If this is spam, please replace the title with ., so that the thread does not appear in search results.

<!--e57a25ab6845829454e8d69fc972939a-->

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

<!--021abf342d371248e50ceaed478a90ca-->

Reviews

See the guideline for information on the review process. A summary of reviews will appear here.

<!--5faf32d7da4f0f540f40219e4f7537a3-->

LLM Linter (✨ experimental)

Possible places where named args for integral literals may be used (e.g. func(x, /*named_arg=*/0) in C++, and func(x, named_arg=0) in Python):

• AddCoins(coins, CTransaction{tx_create}, 0, false) in src/test/transaction_tests.cpp
• AddCoins(coins, CTransaction{tx_create}, 0, false) in src/test/transaction_tests.cpp

Possible places where comparison-specific test macros should replace generic comparisons:

• [test/functional/feature_p2mr.py] assert ( "bad-witness-nonstandard" in res["reject-reason"] or "bad-txns-nonstandard-inputs" in res["reject-reason"] or (...) ) -> Replace with assert_equal(<that_boolean_expression>, True) (or compute cond = ... then assert_equal(cond, True)) to use the comparison-specific helper instead of a bare assert.

^{2026-04-18 14:29:10}