diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-12-06 08:21:14 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-12-06 08:21:57 +0100 |
| commit | ed8d693c71b01caa310922f883b3915c09bb6a35 (patch) | |
| tree | 62eadd8c5279b73c053b0704d5eae5ce7f2436f4 /src/rest.cpp | |
| parent | Merge #9282: CMutableTransaction is defined as struct (diff) | |
| parent | Adapt ZMQ/rest serialization to take rpcserialversion arg (diff) | |
| download | discoin-ed8d693c71b01caa310922f883b3915c09bb6a35.tar.xz discoin-ed8d693c71b01caa310922f883b3915c09bb6a35.zip | |
Merge #9194: Add option to return non-segwit serialization via rpc
412bab2 Adapt ZMQ/rest serialization to take rpcserialversion arg (instagibbs)
bc7ff8d Add option to return non-segwit serialization via rpc (Gregory Sanders)
Diffstat (limited to 'src/rest.cpp')
| -rw-r--r-- | src/rest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rest.cpp b/src/rest.cpp index 6379061f8..6b6b7401f 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -228,7 +228,7 @@ static bool rest_block(HTTPRequest* req, return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found"); } - CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION); + CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags()); ssBlock << block; switch (rf) { @@ -368,7 +368,7 @@ static bool rest_tx(HTTPRequest* req, const std::string& strURIPart) if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true)) return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found"); - CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); + CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags()); ssTx << tx; switch (rf) { |