diff options
| author | Jeff Garzik <[email protected]> | 2014-07-30 23:17:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2014-07-30 23:17:19 -0400 |
| commit | a715a643bcda579c324b2c1d2dac449a320951c9 (patch) | |
| tree | 661781f5c7626ebc89be71311699b08483d4cb86 /src/rpcmining.cpp | |
| parent | Merge pull request #4497 (diff) | |
| parent | Add "bitcoin-tx" command line utility and supporting modules. (diff) | |
| download | discoin-a715a643bcda579c324b2c1d2dac449a320951c9.tar.xz discoin-a715a643bcda579c324b2c1d2dac449a320951c9.zip | |
Merge branch 'rawtx' into merge-rawtx
Diffstat (limited to 'src/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index cbb4ab2f8..edab427cb 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -10,6 +10,7 @@ #include "main.h" #include "miner.h" #include "pow.h" +#include "core_io.h" #ifdef ENABLE_WALLET #include "db.h" #include "wallet.h" @@ -472,9 +473,7 @@ Value getblocktemplate(const Array& params, bool fHelp) Object entry; - CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); - ssTx << tx; - entry.push_back(Pair("data", HexStr(ssTx.begin(), ssTx.end()))); + entry.push_back(Pair("data", EncodeHexTx(tx))); entry.push_back(Pair("hash", txHash.GetHex())); |