highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 15:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate CTransaction hex encode/decode into core_io.h, core_{read,write}.cpp

Browse Source
This commit is contained in:
Jeff Garzik
2014-06-23 23:10:24 -04:00
parent 2920322871
commit ae775b5b31
7 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rpcmining.cpp
View File

@@ -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()));