Merge 21c2879f37 into merged_master (Bitcoin PR bitcoin/bitcoin#30560)

This commit is contained in:
ivanlele 2026-03-11 11:40:25 +00:00
commit 4fc984078d
No known key found for this signature in database
19 changed files with 177 additions and 137 deletions

View file

@ -393,7 +393,7 @@ BOOST_AUTO_TEST_CASE(script_standard_taproot_builder)
XOnlyPubKey key_2{ParseHex("f9308a019258c31049344f85f89d5229b531c845836f99b08601f113bce036f9")};
CScript script_1 = CScript() << ToByteVector(key_1) << OP_CHECKSIG;
CScript script_2 = CScript() << ToByteVector(key_2) << OP_CHECKSIG;
uint256 hash_3 = uint256S("31fe7061656bea2a36aa60a2f7ef940578049273746935d296426dc0afd86b68");
constexpr uint256 hash_3{"31fe7061656bea2a36aa60a2f7ef940578049273746935d296426dc0afd86b68"};
TaprootBuilder builder;
BOOST_CHECK(builder.IsValid() && builder.IsComplete());