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

Merge 297466b49f into merged_master (Bitcoin PR #18826)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:01 +00:00
commit 7444e07772
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core_write.cpp
View file

@ -254,6 +254,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
}
in.pushKV("sequence", (int64_t)txin.nSequence);
// ELEMENTS:
if (tx.witness.vtxinwit.size() > i) {
const CScriptWitness &scriptWitness = tx.witness.vtxinwit[i].scriptWitness;
if (!scriptWitness.IsNull()) {
@ -265,7 +266,6 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
}
}
// ELEMENTS:
if (tx.witness.vtxinwit.size() > i && !tx.witness.vtxinwit[i].m_pegin_witness.IsNull()) {
UniValue pegin_witness(UniValue::VARR);
for (const auto& item : tx.witness.vtxinwit[i].m_pegin_witness.stack) {