Merge c1607b5df4 into merged_master (Bitcoin PR #17957)

This commit is contained in:
Andrew Poelstra 2020-11-14 16:52:13 +00:00
commit 0feee2ea2d
6 changed files with 87 additions and 68 deletions

View file

@ -387,7 +387,7 @@ public:
vout.assign(vAvail.size(), CTxOut());
for (unsigned int i = 0; i < vAvail.size(); i++) {
if (vAvail[i])
::Unserialize(s, CTxOutCompressor(vout[i]));
::Unserialize(s, Using<TxOutCompression>(vout[i]));
}
// coinbase height
::Unserialize(s, VARINT(nHeight, VarIntMode::NONNEGATIVE_SIGNED));