From e848990e005f3fbdd254f9988540659dd43f6d1f Mon Sep 17 00:00:00 2001
From: JBetz <joebetz91@gmail.com>
Date: Wed, 28 Feb 2024 20:46:58 +0100
Subject: [PATCH 1/3] Add compile-time switch for Sequentia RPC definitions

---
 src/Makefile.am                      |   1 +
 src/rpc/rawtransaction.cpp           |   9 ++-
 src/sequentia/rpc/rawtransaction.cpp | 115 +++++++++++++++++++++++++++
 src/sequentia/rpc/rawtransaction.h   |   8 ++
 4 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 src/sequentia/rpc/rawtransaction.cpp
 create mode 100644 src/sequentia/rpc/rawtransaction.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 7a8e53cc34..a7fa283cf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -238,6 +238,7 @@ BITCOIN_CORE_H = \
   script/sign.h \
   script/signingprovider.h \
   script/standard.h \
+  sequentia/rpc/rawtransaction.cpp \
   shutdown.h \
   signet.h \
   streams.h \
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 1881bb12f7..0428d55bfe 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -3,6 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#define __SEQUENTIA__ 1
+
 #include <asset.h>
 #include <base58.h>
 #include <block_proof.h>
@@ -39,6 +41,7 @@
 #include <script/sign.h>
 #include <script/signingprovider.h>
 #include <script/standard.h>
+#include <sequentia/rpc/rawtransaction.h>
 #include <uint256.h>
 #include <util/bip32.h>
 #include <util/moneystr.h>
@@ -457,7 +460,7 @@ static RPCHelpMan verifytxoutproof()
     };
 }
 
-static RPCHelpMan createrawtransaction()
+[[maybe_unused]] static RPCHelpMan createrawtransaction()
 {
     return RPCHelpMan{"createrawtransaction",
                 "\nCreate a transaction spending the given inputs and creating new outputs.\n"
@@ -3382,7 +3385,11 @@ static const CRPCCommand commands[] =
 { //  category              actor (function)            argNames
   //  --------------------- ------------------------        -----------------------     ----------
     { "rawtransactions",    &getrawtransaction,           },
+#ifdef __SEQUENTIA__
+    { "rawtransactions",    &sequentia::createrawtransaction, },
+#else
     { "rawtransactions",    &createrawtransaction,        },
+#endif
     { "rawtransactions",    &decoderawtransaction,        },
     { "rawtransactions",    &decodescript,                },
     { "rawtransactions",    &sendrawtransaction,          },
diff --git a/src/sequentia/rpc/rawtransaction.cpp b/src/sequentia/rpc/rawtransaction.cpp
new file mode 100644
index 0000000000..bd717e5957
--- /dev/null
+++ b/src/sequentia/rpc/rawtransaction.cpp
@@ -0,0 +1,115 @@
+// Copyright (c) 2010 Satoshi Nakamoto
+// Copyright (c) 2009-2021 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <node/coin.h>
+#include <node/psbt.h>
+#include <rpc/blockchain.h>
+#include <rpc/rawtransaction_util.h>
+#include <rpc/server_util.h>
+#include <script/standard.h>
+#include <sequentia/rpc/rawtransaction.h>
+#include <validation.h>
+
+namespace sequentia
+{
+
+static std::vector<RPCArg> CreateTxDoc()
+{
+    return {
+        {"inputs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The inputs",
+            {
+                {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                    {
+                        {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id"},
+                        {"vout", RPCArg::Type::NUM, RPCArg::Optional::NO, "The output number"},
+                        {"sequence", RPCArg::Type::NUM, RPCArg::DefaultHint{"depends on the value of the 'replaceable' and 'locktime' arguments"}, "The sequence number"},
+                        {"pegin_bitcoin_tx", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED_NAMED_ARG, "(only for pegin inputs) The raw bitcoin transaction (in hex) depositing bitcoin to the mainchain_address generated by getpeginaddress"},
+                        {"pegin_txout_proof", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED_NAMED_ARG, "(only for pegin inputs) A rawtxoutproof (in hex) generated by the mainchain daemon's `gettxoutproof` containing a proof of only bitcoin_tx"},
+                        {"pegin_claim_script", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED_NAMED_ARG, "(only for pegin inputs) The claim script generated by getpeginaddress."},
+                    },
+                    },
+            },
+            },
+        {"outputs", RPCArg::Type::ARR, RPCArg::Optional::NO, "The outputs (key-value pairs), where none of the keys are duplicated.\n"
+                "That is, each address can only appear once and there can only be one 'data' object.\n"
+                "For compatibility reasons, a dictionary, which holds the key-value pairs directly, is also\n"
+                "                             accepted as second parameter.",
+            {
+                {"", RPCArg::Type::OBJ_USER_KEYS, RPCArg::Optional::OMITTED, "",
+                    {
+                        {"address", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "A key-value pair. The key (string) is the bitcoin address, the value (float or string) is the amount in " + CURRENCY_UNIT},
+                        {"asset", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "The asset tag for this output if it is not the main chain asset"},
+                    },
+                    },
+                {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                    {
+                        {"data", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "A key-value pair. The key must be \"data\", the value is hex-encoded data"},
+                    },
+                    },
+                {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                    {
+                        {"vdata", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The key is \"vdata\", the value is an array of hex encoded data"},
+                    },
+                    },
+                {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                    {
+                        {"burn", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "A key-value pair. The key must be \"burn\", the value is the amount that will be burned."},
+                    },
+                    },
+                {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                    {
+                        {"fee", RPCArg::Type::AMOUNT, RPCArg::Optional::NO, "The key is \"fee\", the value the fee output you want to add."},
+                    },
+                    },
+            },
+            },
+        {"locktime", RPCArg::Type::NUM, RPCArg::Default{0}, "Raw locktime. Non-0 value also locktime-activates inputs"},
+        {"replaceable", RPCArg::Type::BOOL, RPCArg::Default{false}, "Marks this transaction as BIP125-replaceable.\n"
+"                             Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible."},
+    };
+}
+
+RPCHelpMan createrawtransaction()
+{
+    return RPCHelpMan{"createrawtransaction",
+                "\nCreate a transaction spending the given inputs and creating new outputs.\n"
+                "Outputs can be addresses or data.\n"
+                "Returns hex-encoded raw transaction.\n"
+                "Note that the transaction's inputs are not signed, and\n"
+                "it is not stored in the wallet or transmitted to the network.\n",
+                CreateTxDoc(),
+                RPCResult{
+                    RPCResult::Type::STR_HEX, "transaction", "hex string of the transaction"
+                },
+                RPCExamples{
+                    HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"[{\\\"address\\\":0.01}]\"")
+            + HelpExampleCli("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\" \"[{\\\"data\\\":\\\"00010203\\\"}]\"")
+            + HelpExampleRpc("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\", \"[{\\\"address\\\":0.01}]\"")
+            + HelpExampleRpc("createrawtransaction", "\"[{\\\"txid\\\":\\\"myid\\\",\\\"vout\\\":0}]\", \"[{\\\"data\\\":\\\"00010203\\\"}]\"")
+                },
+        [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
+{
+    ChainstateManager& chainman = EnsureAnyChainman(request.context);
+
+    RPCTypeCheck(request.params, {
+        UniValue::VARR,
+        UniValue::VARR,
+        UniValue::VNUM,
+        UniValue::VBOOL,
+        }, true
+    );
+
+    bool rbf = false;
+    if (!request.params[3].isNull()) {
+        rbf = request.params[3].isTrue();
+    }
+    CMutableTransaction rawTx = ConstructTransaction(request.params[0], request.params[1], request.params[2], rbf, chainman.ActiveChain().Tip());
+
+    return EncodeHexTx(CTransaction(rawTx));
+},
+    };
+}
+
+}
diff --git a/src/sequentia/rpc/rawtransaction.h b/src/sequentia/rpc/rawtransaction.h
new file mode 100644
index 0000000000..e3874c63f4
--- /dev/null
+++ b/src/sequentia/rpc/rawtransaction.h
@@ -0,0 +1,8 @@
+#include <rpc/util.h>
+
+namespace sequentia
+{
+
+RPCHelpMan createrawtransaction();
+
+}

From 2ecfbd281b714a3f82eaa1b307aea28c41b63e57 Mon Sep 17 00:00:00 2001
From: JBetz <joebetz91@gmail.com>
Date: Thu, 29 Feb 2024 16:18:51 +0100
Subject: [PATCH 2/3] Move entire RPC command registration function into
 separate block

---
 src/rpc/rawtransaction.cpp | 44 +++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 0428d55bfe..70b5f68b62 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -3378,18 +3378,55 @@ static RPCHelpMan updatepsbtpegin()
 // END ELEMENTS
 //
 
+#ifdef __SEQUENTIA__
 void RegisterRawTransactionRPCCommands(CRPCTable &t)
 {
 // clang-format off
-static const CRPCCommand commands[] =
+static const CRPCCommand commands[] = 
 { //  category              actor (function)            argNames
   //  --------------------- ------------------------        -----------------------     ----------
     { "rawtransactions",    &getrawtransaction,           },
-#ifdef __SEQUENTIA__
     { "rawtransactions",    &sequentia::createrawtransaction, },
+    { "rawtransactions",    &decoderawtransaction,        },
+    { "rawtransactions",    &decodescript,                },
+    { "rawtransactions",    &sendrawtransaction,          },
+    { "rawtransactions",    &combinerawtransaction,       },
+    { "rawtransactions",    &signrawtransactionwithkey,   },
+    { "rawtransactions",    &testmempoolaccept,           },
+    { "rawtransactions",    &decodepsbt,                  },
+    { "rawtransactions",    &combinepsbt,                 },
+    { "rawtransactions",    &finalizepsbt,                },
+    { "rawtransactions",    &createpsbt,                  },
+    { "rawtransactions",    &converttopsbt,               },
+    { "rawtransactions",    &utxoupdatepsbt,              },
+    { "rawtransactions",    &parsepsbt,                   },
+#if 0
+    { "rawtransactions",    &joinpsbts,                   },
+#endif
+    { "rawtransactions",    &analyzepsbt,                 },
+
+    { "blockchain",         &gettxoutproof,               },
+    { "blockchain",         &verifytxoutproof,            },
+    { "rawtransactions",    &rawissueasset,               },
+    { "rawtransactions",    &rawreissueasset,             },
+    { "rawtransactions",    &rawblindrawtransaction,      },
+    { "rawtransactions",    &calculateasset,              },
+    { "rawtransactions",    &updatepsbtpegin,             },
+};
+// clang-format on
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
+}
 #else
+void RegisterRawTransactionRPCCommands(CRPCTable &t)
+{
+// clang-format off
+static const CRPCCommand commands[] =
+{ //  category              actor (function)            argNames
+  //  --------------------- ------------------------        -----------------------     ----------
+    { "rawtransactions",    &getrawtransaction,           },
     { "rawtransactions",    &createrawtransaction,        },
-#endif
     { "rawtransactions",    &decoderawtransaction,        },
     { "rawtransactions",    &decodescript,                },
     { "rawtransactions",    &sendrawtransaction,          },
@@ -3421,3 +3458,4 @@ static const CRPCCommand commands[] =
         t.appendCommand(c.name, &c);
     }
 }
+#endif

From 5e9b8686ddc393e66d9d973417a85cdddc07543e Mon Sep 17 00:00:00 2001
From: JBetz <joebetz91@gmail.com>
Date: Thu, 29 Feb 2024 16:25:00 +0100
Subject: [PATCH 3/3] Put Sequentia includes into an #ifdef block

---
 src/rpc/rawtransaction.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 70b5f68b62..a71d02633e 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -4,6 +4,9 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #define __SEQUENTIA__ 1
+#ifdef __SEQUENTIA__
+#include <sequentia/rpc/rawtransaction.h>
+#endif
 
 #include <asset.h>
 #include <base58.h>
@@ -41,7 +44,6 @@
 #include <script/sign.h>
 #include <script/signingprovider.h>
 #include <script/standard.h>
-#include <sequentia/rpc/rawtransaction.h>
 #include <uint256.h>
 #include <util/bip32.h>
 #include <util/moneystr.h>