diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-12-21 14:04:03 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-12-21 14:04:06 +0100 |
| commit | e8cfe1ee2d01c493b758a67ad14707dca15792ea (patch) | |
| tree | 8164f54ddbb171d62bb9bf54949c18a06e5e40dc /src/core_write.cpp | |
| parent | Merge #9308: [test] Add CCoinsViewCache Access/Modify/Write tests (diff) | |
| parent | Move CTxInWitness inside CTxIn (diff) | |
| download | discoin-e8cfe1ee2d01c493b758a67ad14707dca15792ea.tar.xz discoin-e8cfe1ee2d01c493b758a67ad14707dca15792ea.zip | |
Merge #8589: Inline CTxInWitness inside CTxIn
f6fb7ac Move CTxInWitness inside CTxIn (Pieter Wuille)
Diffstat (limited to 'src/core_write.cpp')
| -rw-r--r-- | src/core_write.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core_write.cpp b/src/core_write.cpp index 9f859ba9e..9eed2270d 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -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); |