diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-02-19 09:35:08 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-02-19 09:35:10 +0100 |
| commit | a6c3da131c855650e8888a9403776cfda0d0ee2e (patch) | |
| tree | 59abc8ebfb6811f2e44184bb552f2cad7e4b2a29 | |
| parent | 5d254a234d8c1569b0161264cc6d5d8d0ce0d864 (diff) | |
| parent | d4b3483cece9c27d58e4026df35725655ce06cf5 (diff) | |
| download | bitcoin-a6c3da131c855650e8888a9403776cfda0d0ee2e.tar.xz | |
Merge bitcoin/bitcoin#24350: Primitives: Correct CTransaction deserialization docstring
d4b3483cece9c27d58e4026df35725655ce06cf5 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
| -rw-r--r-- | src/primitives/transaction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 1fcbc45c72..fb98fb6868 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -201,7 +201,7 @@ struct CMutableTransaction; * - std::vector<CTxIn> vin * - std::vector<CTxOut> vout * - if (flags & 1): - * - CTxWitness wit; + * - CScriptWitness scriptWitness; (deserialized into CTxIn) * - uint32_t nLockTime */ template<typename Stream, typename TxType> |