[RPC][Tests] Include proTx data in json formatted transactions

random-zebra · random-zebra · commit e754732d87a2 · 2021-05-04T23:43:38.000+02:00
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -7,6 +7,8 @@
 
 #include "base58.h"
 #include "core_io.h"
+#include "evo/specialtx.h"
+#include "evo/providertx.h"
 #include "init.h"
 #include "keystore.h"
 #include "validationinterface.h"
@@ -31,6 +33,27 @@
 
 #include <univalue.h>
 
+template <typename Payload>
+static void PayloadToJSON(const CTransaction& tx, Payload& pl, UniValue& entry)
+{
+    if (GetTxPayload(tx, pl)) {
+        UniValue payloadObj;
+        pl.ToJson(payloadObj);
+        entry.pushKV("payload", payloadObj);
+    }
+}
+
+static void PayloadToJSON(const CTransaction& tx, UniValue& entry)
+{
+    switch(tx.nType) {
+        case CTransaction::TxType::PROREG: {
+            ProRegPL pl;
+            PayloadToJSON(tx, pl, entry);
+            break;
+        }
+    }
+}
+
 void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
 {
     // Call into TxToUniv() in bitcoin-common to decode the transaction hex.
@@ -54,6 +77,11 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
         }
     }
 
+    // Special txes
+    if (tx.IsSpecialTx()) {
+        PayloadToJSON(tx, entry);
+    }
+
     if (!hashBlock.IsNull()) {
         entry.pushKV("blockhash", hashBlock.GetHex());
         BlockMap::iterator mi = mapBlockIndex.find(hashBlock);
