GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge ef380a454c into merged_master (Bitcoin PR bitcoin/bitcoin#32863)

Browse source
This commit is contained in:
ivanlele 2026-07-13 15:43:38 +00:00
commit 342b1e8b6c
No known key found for this signature in database
21 changed files with 251 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/script_p2sh_tests.cpp
View file

@ -364,6 +364,12 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
// 22 P2SH sigops for all inputs (1 for vin[0], 6 for vin[3], 15 for vin[4]
BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txTo), coins), 22U);
CMutableTransaction coinbase_tx_mut;
coinbase_tx_mut.vin.resize(1);
CTransaction coinbase_tx{coinbase_tx_mut};
BOOST_CHECK(coinbase_tx.IsCoinBase());
BOOST_CHECK_EQUAL(GetP2SHSigOpCount(coinbase_tx, coins), 0U);
CMutableTransaction txToNonStd1;
txToNonStd1.vout.resize(1);
txToNonStd1.vout[0].scriptPubKey = GetScriptForDestination(PKHash(key[1].GetPubKey()));