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/core_io.h | |
| 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/core_io.h')
| -rw-r--r-- | src/core_io.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core_io.h b/src/core_io.h index 5aecbc4489..4344290bb8 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -11,13 +11,14 @@ class CBlock; class CScript; class CTransaction; +class CMutableTransaction; class uint256; class UniValue; // core_read.cpp CScript ParseScript(const std::string& s); std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false); -bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false); +bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false); bool DecodeHexBlk(CBlock&, const std::string& strHexBlk); uint256 ParseHashUV(const UniValue& v, const std::string& strName); uint256 ParseHashStr(const std::string&, const std::string& strName); |