Skip to content

Commit a6c3da1

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24350: Primitives: Correct CTransaction deserialization docstring
d4b3483 Primitives: Correct CTransaction deserialization docstring (TheCharlatan) Pull request description: Since bitcoin/bitcoin#8589 CTxWitness was removed and instead replaced with CScriptWitness inside each CTxIn. ACKs for top commit: w0xlt: ACK d4b3483 Tree-SHA512: 02bb73e8a7d1fc449e4776a162009261baecc573837fade74ad7d76b3cd63200424e02fd0abd000c63706072f2ab3c95d3053139495b81347463f43e56192ca9
2 parents 5d254a2 + d4b3483 commit a6c3da1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/primitives/transaction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ struct CMutableTransaction;
201201
* - std::vector<CTxIn> vin
202202
* - std::vector<CTxOut> vout
203203
* - if (flags & 1):
204-
* - CTxWitness wit;
204+
* - CScriptWitness scriptWitness; (deserialized into CTxIn)
205205
* - uint32_t nLockTime
206206
*/
207207
template<typename Stream, typename TxType>

0 commit comments

Comments
 (0)