From ab2332461bf639916e432d5abcd41be6d0eaf6ff Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Sun, 20 Nov 2016 09:54:51 -0500
Subject: [PATCH] Add option to return non-segwit serialization via rpc

---
 src/core_io.h              | 2 +-
 src/core_write.cpp         | 4 ++--
 src/rpc/blockchain.cpp     | 2 +-
 src/rpc/rawtransaction.cpp | 2 +-
 src/rpc/server.cpp         | 5 +++++
 src/rpc/server.h           | 5 +++++
 src/wallet/rpcwallet.cpp   | 2 +-
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/core_io.h b/src/core_io.h
index e8c0c49e8..bd8b8942b 100644
--- a/src/core_io.h
+++ b/src/core_io.h
@@ -25,7 +25,7 @@ extern std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::strin
 
 // core_write.cpp
 extern std::string FormatScript(const CScript& script);
-extern std::string EncodeHexTx(const CTransaction& tx);
+extern std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags = 0);
 extern void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
 extern void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry);
 
diff --git a/src/core_write.cpp b/src/core_write.cpp
index afdf62863..889976084 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -116,9 +116,9 @@ string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode)
     return str;
 }
 
-string EncodeHexTx(const CTransaction& tx)
+string EncodeHexTx(const CTransaction& tx, const int serialFlags)
 {
-    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION | serialFlags);
     ssTx << tx;
     return HexStr(ssTx.begin(), ssTx.end());
 }
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 85b04e8f5..7cdb80114 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -486,7 +486,7 @@ UniValue getblock(const UniValue& params, bool fHelp)
 
     if (!fVerbose)
     {
-        CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
+        CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION | RPCSerializationFlags());
         ssBlock << block;
         std::string strHex = HexStr(ssBlock.begin(), ssBlock.end());
         return strHex;
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 466801332..e39e422f7 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -197,7 +197,7 @@ UniValue getrawtransaction(const UniValue& params, bool fHelp)
     if (!GetTransaction(hash, tx, Params().GetConsensus(), hashBlock, true))
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
 
-    string strHex = EncodeHexTx(tx);
+    string strHex = EncodeHexTx(tx, RPCSerializationFlags());
 
     if (!fVerbose)
         return strHex;
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 4c6a44f4a..a4fa5c6fb 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -523,4 +523,9 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6
     deadlineTimers.insert(std::make_pair(name, std::shared_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000))));
 }
 
+int RPCSerializationFlags()
+{
+    return 0;
+}
+
 CRPCTable tableRPC;
diff --git a/src/rpc/server.h b/src/rpc/server.h
index e44a051b0..4a83c0022 100644
--- a/src/rpc/server.h
+++ b/src/rpc/server.h
@@ -19,6 +19,8 @@
 
 #include <univalue.h>
 
+static const unsigned int DEFAULT_RPC_SERIALIZE_VERSION = 1;
+
 class CRPCCommand;
 
 namespace RPCServer
@@ -196,4 +198,7 @@ void InterruptRPC();
 void StopRPC();
 std::string JSONRPCExecBatch(const UniValue& vReq);
 
+// Retrieves any serialization flags requested in command line argument
+int RPCSerializationFlags();
+
 #endif // BITCOIN_RPCSERVER_H
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1021bbc66..7c68cd23a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1775,7 +1775,7 @@ UniValue gettransaction(const UniValue& params, bool fHelp)
     ListTransactions(wtx, "*", 0, false, details, filter);
     entry.push_back(Pair("details", details));
 
-    string strHex = EncodeHexTx(static_cast<CTransaction>(wtx));
+    string strHex = EncodeHexTx(static_cast<CTransaction>(wtx), RPCSerializationFlags());
     entry.push_back(Pair("hex", strHex));
 
     return entry;