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 6300438a2e into merged_master (Bitcoin PR bitcoin/bitcoin#30115)

Browse source
This commit is contained in:
Tom Trevethan 2026-02-23 23:41:30 +00:00
commit b64d8b87c8
26 changed files with 162 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core_write.cpp
View file

@ -345,7 +345,7 @@ void TxToUniv(const CTransaction& tx, const uint256& block_hash, UniValue& entry
vin.push_back(in);
}
entry.pushKV("vin", vin);
entry.pushKV("vin", std::move(vin));
CAmountMap fee_map{};
UniValue vout(UniValue::VARR);
@ -402,7 +402,7 @@ void TxToUniv(const CTransaction& tx, const uint256& block_hash, UniValue& entry
out.pushKV("scriptPubKey", o);
vout.push_back(out);
}
entry.pushKV("vout", vout);
entry.pushKV("vout", std::move(vout));
// ELEMENTS: add fee map rather than single fee. Unlike other areas of the RPC,
// we do not look up labels here and will always use the asset hex (contrast