Add pegin and pegout RPC calls

src/Makefile.am

@@ -142,6 +142,7 @@ BITCOIN_CORE_H = \
   netmessagemaker.h \
   noui.h \
   outputtype.h \
+  pegins.h \
   policy/feerate.h \
   policy/fees.h \
   policy/policy.h \
@@ -240,6 +241,7 @@ libbitcoin_server_a_SOURCES = \
   net_processing.cpp \
   noui.cpp \
   outputtype.cpp \
+  pegins.cpp \
   policy/fees.cpp \
   policy/policy.cpp \
   policy/rbf.cpp \

src/consensus/tx_verify.cpp

@@ -5,10 +5,10 @@
 #include <consensus/tx_verify.h>
 
 #include <consensus/consensus.h>
+#include <consensus/validation.h>
+#include <pegins.h>
 #include <primitives/transaction.h>
 #include <script/interpreter.h>
-#include <consensus/validation.h>
-#include <validation.h>
 
 // TODO remove the following dependencies
 #include <chain.h>

src/core_write.cpp

@@ -151,30 +151,50 @@ void ScriptToUniv(const CScript& script, UniValue& out, bool include_address)
     }
 }
 
-void ScriptPubKeyToUniv(const CScript& scriptPubKey,
-                        UniValue& out, bool fIncludeHex)
+// ELEMENTS:
+static void SidechainScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex, bool is_parent_chain)
 {
+    const std::string prefix = is_parent_chain ? "pegout_" : "";
     txnouttype type;
     std::vector<CTxDestination> addresses;
     int nRequired;
 
-    out.pushKV("asm", ScriptToAsmStr(scriptPubKey));
+    out.pushKV(prefix + "asm", ScriptToAsmStr(scriptPubKey));
     if (fIncludeHex)
-        out.pushKV("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end()));
+        out.pushKV(prefix + "hex", HexStr(scriptPubKey.begin(), scriptPubKey.end()));
 
     if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired)) {
-        out.pushKV("type", GetTxnOutputType(type));
+        out.pushKV(prefix + "type", GetTxnOutputType(type));
         return;
     }
 
-    out.pushKV("reqSigs", nRequired);
-    out.pushKV("type", GetTxnOutputType(type));
+    out.pushKV(prefix + "reqSigs", nRequired);
+    out.pushKV(prefix + "type", GetTxnOutputType(type));
 
     UniValue a(UniValue::VARR);
-    for (const CTxDestination& addr : addresses) {
-        a.push_back(EncodeDestination(addr));
+    if (is_parent_chain) {
+        for (const CTxDestination& addr : addresses) {
+            a.push_back(EncodeParentDestination(addr));
+        }
+    } else {
+        for (const CTxDestination& addr : addresses) {
+            a.push_back(EncodeDestination(addr));
+        }
+    }
+    out.pushKV(prefix + "addresses", a);
+}
+
+void ScriptPubKeyToUniv(const CScript& scriptPubKey,
+                        UniValue& out, bool fIncludeHex)
+{
+    SidechainScriptPubKeyToJSON(scriptPubKey, out, fIncludeHex, false);
+
+    uint256 pegout_chain;
+    CScript pegout_scriptpubkey;
+    if (scriptPubKey.IsPegoutScript(pegout_chain, pegout_scriptpubkey)) {
+        out.pushKV("pegout_chain", pegout_chain.GetHex());
+        SidechainScriptPubKeyToJSON(pegout_scriptpubkey, out, fIncludeHex, true);
     }
-    out.pushKV("addresses", a);
 }
 
 void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex, int serialize_flags)

src/policy/policy.cpp

@@ -10,6 +10,7 @@
 #include <consensus/validation.h>
 #include <validation.h>
 #include <coins.h>
+#include <pegins.h>
 #include <tinyformat.h>
 #include <util.h>
 #include <utilstrencodings.h>

src/rpc/misc.cpp

@@ -13,6 +13,7 @@
 #include <net.h>
 #include <netbase.h>
 #include <outputtype.h>
+#include <pegins.h>
 #include <rpc/blockchain.h>
 #include <rpc/server.h>
 #include <rpc/util.h>

src/rpc/rawtransaction.cpp

@@ -10,11 +10,10 @@
 #include <core_io.h>
 #include <index/txindex.h>
 #include <keystore.h>
-#include <validation.h>
-#include <validationinterface.h>
 #include <key_io.h>
 #include <merkleblock.h>
 #include <net.h>
+#include <pegins.h>
 #include <policy/policy.h>
 #include <policy/rbf.h>
 #include <primitives/transaction.h>
@@ -27,6 +26,8 @@
 #include <txmempool.h>
 #include <uint256.h>
 #include <utilstrencodings.h>
+#include <validation.h>
+#include <validationinterface.h>
 #ifdef ENABLE_WALLET
 #include <wallet/rpcwallet.h>
 #endif
@@ -124,7 +125,12 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
             "         \"addresses\" : [           (json array of string)\n"
             "           \"address\"        (string) bitcoin address\n"
             "           ,...\n"
-            "         ]\n"
+            "         ],\n"
+            "         \"pegout_chain\" : \"hex\", (string) (only pegout) Hash of genesis block of parent chain'\n"
+            "         \"pegout_asm\":\"asm\",     (string) (only pegout) pegout scriptpubkey (asm)'\n"
+            "         \"pegout_hex\":\"hex\",     (string) (only pegout) pegout scriptpubkey (hex)'\n"
+            "         \"pegout_type\" : \"pubkeyhash\", (string) (only pegout) The pegout type, eg 'pubkeyhash'\n"
+            "         \"pegout_addresses\" : [    (json array of string) (only pegout)\n"
             "       }\n"
             "     }\n"
             "     ,...\n"
@@ -866,19 +872,34 @@ UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival
     // Script verification errors
     UniValue vErrors(UniValue::VARR);
 
+    // ELEMENTS:
+    // Track an immature peg-in that's otherwise valid, give warning
+    bool immature_pegin = false;
+
     // Use CTransaction for the constant parts of the
     // transaction to avoid rehashing.
     const CTransaction txConst(mtx);
-    // Sign what we can:
+    // Sign what we can, including pegin inputs:
     for (unsigned int i = 0; i < mtx.vin.size(); i++) {
         CTxIn& txin = mtx.vin[i];
         const Coin& coin = view.AccessCoin(txin.prevout);
-        if (coin.IsSpent()) {
+
+        if (!txin.m_is_pegin && coin.IsSpent()) {
             TxInErrorToJSON(txin, vErrors, "Input not found or already spent");
             continue;
+        } else if (txin.m_is_pegin && (!IsValidPeginWitness(txConst.vin[i].m_pegin_witness, txin.prevout, false))) {
+            TxInErrorToJSON(txin, vErrors, "Peg-in input has invalid proof.");
+            continue;
         }
-        const CScript& prevPubKey = coin.out.scriptPubKey;
-        const CAmount& amount = coin.out.nValue;
+        // Report warning about immature peg-in though
+        if(txin.m_is_pegin && !IsValidPeginWitness(txConst.vin[i].m_pegin_witness, txin.prevout, true)) {
+            immature_pegin = true;
+        }
+
+        const CScript& prevPubKey = txin.m_is_pegin ? GetPeginOutputFromWitness(txConst.vin[i].m_pegin_witness).scriptPubKey : coin.out.scriptPubKey;
+        //TODO(rebase) CT
+        //const CConfidentialValue& amount = txin.m_is_pegin ? GetPeginOutputFromWitness(txConst.vin[i].m_pegin_witness).nValue : coin.out.nValue;
+        const CAmount& amount = txin.m_is_pegin ? GetPeginOutputFromWitness(txConst.vin[i].m_pegin_witness).nValue : coin.out.nValue;
 
         SignatureData sigdata = DataFromTransaction(mtx, i, coin.out);
         // Only sign SIGHASH_SINGLE if there's a corresponding output:
@@ -911,6 +932,9 @@ UniValue SignTransaction(CMutableTransaction& mtx, const UniValue& prevTxsUnival
     if (!vErrors.empty()) {
         result.pushKV("errors", vErrors);
     }
+    if (immature_pegin) {
+        result.pushKV("warning", "Possibly immature peg-in input(s) detected, signed anyways.");
+    }
 
     return result;
 }
@@ -966,6 +990,7 @@ static UniValue signrawtransactionwithkey(const JSONRPCRequest& request)
             "    }\n"
             "    ,...\n"
             "  ]\n"
+            "  \"warning\" : \"text\"            (string) Warning that a peg-in input signed may be immature. This could mean lack of connectivity to or misconfiguration of the bitcoind."
             "}\n"
 
             "\nExamples:\n"
@@ -1052,6 +1077,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
             "    }\n"
             "    ,...\n"
             "  ]\n"
+            "  \"warning\" : \"text\"            (string) Warning that a peg-in input signed may be immature. This could mean lack of connectivity to or misconfiguration of the bitcoind."
             "}\n"
 
             "\nExamples:\n"
@@ -1094,7 +1120,7 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
     }
 }
 
-static UniValue sendrawtransaction(const JSONRPCRequest& request)
+UniValue sendrawtransaction(const JSONRPCRequest& request)
 {
     if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
         throw std::runtime_error(

src/validation.cpp

@@ -18,6 +18,7 @@
 #include <hash.h>
 #include <index/txindex.h>
 #include <mainchainrpc.h>
+#include <pegins.h>
 #include <policy/fees.h>
 #include <policy/policy.h>
 #include <policy/rbf.h>
@@ -27,15 +28,13 @@
 #include <reverse_iterator.h>
 #include <script/script.h>
 #include <script/sigcache.h>
-#include <script/standard.h>
 #include <shutdown.h>
 #include <timedata.h>
 #include <tinyformat.h>
 #include <txdb.h>
 #include <txmempool.h>
 #include <ui_interface.h>
 #include <undo.h>
-#include <util.h>
 #include <utilmoneystr.h>
 #include <utilstrencodings.h>
 #include <validationinterface.h>