diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-05 08:01:20 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-05 08:05:48 +0100 |
| commit | 46904ee5d2ce867b522a582b23e1ac6735179e5c (patch) | |
| tree | ac8c79733afef5eb6dff533ec867165d968d2b12 /src/net_processing.cpp | |
| parent | 4d955fc5824b1891ea082f5ebdfa5473e37323ca (diff) | |
| parent | 81e3228fcb33e8ed32d8b9fbe917444ba080073a (diff) | |
| download | bitcoin-46904ee5d2ce867b522a582b23e1ac6735179e5c.tar.xz | |
Merge #8580: Make CTransaction actually immutable
81e3228 Make CTransaction actually immutable (Pieter Wuille)
42fd8de Make DecodeHexTx return a CMutableTransaction (Pieter Wuille)
c3f5673 Make CWalletTx store a CTransactionRef instead of inheriting (Pieter Wuille)
a188353 Switch GetTransaction to returning a CTransactionRef (Pieter Wuille)
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 747167264b..b1283c236c 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1594,8 +1594,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, deque<COutPoint> vWorkQueue; vector<uint256> vEraseQueue; - CTransaction tx; - vRecv >> tx; + CTransaction tx(deserialize, vRecv); CInv inv(MSG_TX, tx.GetHash()); pfrom->AddInventoryKnown(inv); |