Merge bitcoin/bitcoin#24350: Primitives: Correct CTransaction deserialization docstring

d4b3483cec Primitives: Correct CTransaction deserialization docstring (TheCharlatan)

Pull request description:

  Since https://github.com/bitcoin/bitcoin/pull/8589 CTxWitness was removed and instead replaced with CScriptWitness inside each CTxIn.

ACKs for top commit:
  w0xlt:
    ACK d4b3483

Tree-SHA512: 02bb73e8a7d1fc449e4776a162009261baecc573837fade74ad7d76b3cd63200424e02fd0abd000c63706072f2ab3c95d3053139495b81347463f43e56192ca9
pull/24390/head
MarcoFalke 3 years ago
commit a6c3da131c
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548

@ -201,7 +201,7 @@ struct CMutableTransaction;
* - std::vector<CTxIn> vin * - std::vector<CTxIn> vin
* - std::vector<CTxOut> vout * - std::vector<CTxOut> vout
* - if (flags & 1): * - if (flags & 1):
* - CTxWitness wit; * - CScriptWitness scriptWitness; (deserialized into CTxIn)
* - uint32_t nLockTime * - uint32_t nLockTime
*/ */
template<typename Stream, typename TxType> template<typename Stream, typename TxType>

Loading…
Cancel
Save