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

Merge #8589: Inline CTxInWitness inside CTxIn

Browse source 
f6fb7ac Move CTxInWitness inside CTxIn (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan 2016-12-21 14:04:03 +01:00
commit e8cfe1ee2d
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
18 changed files with 96 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core_write.cpp
View file

@ -168,9 +168,9 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry)
o.pushKV("asm", ScriptToAsmStr(txin.scriptSig, true));
o.pushKV("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()));
in.pushKV("scriptSig", o);
if (!tx.wit.IsNull() && i < tx.wit.vtxinwit.size() && !tx.wit.vtxinwit[i].IsNull()) {
if (!tx.vin[i].scriptWitness.IsNull()) {
UniValue txinwitness(UniValue::VARR);
for (const auto& item : tx.wit.vtxinwit[i].scriptWitness.stack) {
for (const auto& item : tx.vin[i].scriptWitness.stack) {
txinwitness.push_back(HexStr(item.begin(), item.end()));
}
in.pushKV("txinwitness", txinwitness);