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

Merge fe4e83f50d into merged_master (Bitcoin PR bitcoin/bitcoin#28912)

Browse source
This commit is contained in:
Byron Hambly 2025-11-11 10:26:47 +02:00
commit 12b5689c12
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
21 changed files with 83 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/script_tests.cpp
View file

@ -1512,7 +1512,7 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps)
static CMutableTransaction TxFromHex(const std::string& str)
{
CMutableTransaction tx;
SpanReader{0, ParseHex(str)} >> TX_NO_WITNESS(tx);
SpanReader{ParseHex(str)} >> TX_NO_WITNESS(tx);
return tx;
}
@ -1522,7 +1522,7 @@ static std::vector<CTxOut> TxOutsFromJSON(const UniValue& univalue)
std::vector<CTxOut> prevouts;
for (size_t i = 0; i < univalue.size(); ++i) {
CTxOut txout;
SpanReader{0, ParseHex(univalue[i].get_str())} >> txout;
SpanReader{ParseHex(univalue[i].get_str())} >> txout;
prevouts.push_back(std::move(txout));
}
return prevouts;
@ -1885,7 +1885,7 @@ BOOST_AUTO_TEST_CASE(bip341_keypath_test_vectors)
for (const auto& vec : vectors.getValues()) {
auto txhex = ParseHex(vec["given"]["rawUnsignedTx"].get_str());
CMutableTransaction tx;
SpanReader{PROTOCOL_VERSION, txhex} >> TX_WITH_WITNESS(tx);
SpanReader{txhex} >> TX_WITH_WITNESS(tx);
std::vector<CTxOut> utxos;
for (const auto& utxo_spent : vec["given"]["utxosSpent"].getValues()) {
auto script_bytes = ParseHex(utxo_spent["scriptPubKey"].get_str());