Replace Sequentia mode with No Coin feature flag (g_con_sequentiamode…

… -> g_con_any_asset_fees)
SequentiaSEQ · Apr 4, 2024 · 0d0ec93 · 0d0ec93
1 parent a7f0f76
commit 0d0ec93
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 14 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1330,7 +1330,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // ELEMENTS:
     policyAsset = CAsset(uint256S(gArgs.GetArg("-feeasset", chainparams.GetConsensus().pegged_asset.GetHex())));
-    if (g_con_sequentiamode) {
+    if (g_con_any_asset_fees) {
         std::string file_path_string = gArgs.GetArg("-exchangeratesjsonfile", "");
         if (!file_path_string.empty()) {
             fs::path file_path = AbsPathForConfigVal(fs::PathFromString(file_path_string));

diff --git a/src/node/miner.cpp b/src/node/miner.cpp
@@ -194,7 +194,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     CMutableTransaction coinbaseTx;
     coinbaseTx.vin.resize(1);
     coinbaseTx.vin[0].prevout.SetNull();
-    if (g_con_sequentiamode && feeMap.size() > 0) {
+    if (g_con_any_asset_fees && feeMap.size() > 0) {
         coinbaseTx.vout.resize(feeMap.size());
         int index = 0;
         for (auto fee : feeMap) {

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -13,8 +13,7 @@
 #include <assert.h>
 
 bool g_con_elementsmode = false;
-// TODO: Default to false and override using new chain params class for Sequentia
-bool g_con_sequentiamode = true;
+bool g_con_any_asset_fees = false;
 
 const int32_t CTransaction::CURRENT_VERSION = 2;
 

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -27,9 +27,7 @@ static const int SERIALIZE_TRANSACTION_NO_WITNESS = 0x40000000;
 // ELEMENTS:
 // Globals to avoid circular dependencies.
 extern bool g_con_elementsmode;
-
-// SEQUENTIA:
-extern bool g_con_sequentiamode;
+extern bool g_con_any_asset_fees;
 
 /** An outpoint - a combination of a transaction hash and an index n into its vout */
 class COutPoint

diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
@@ -323,8 +323,8 @@ CMutableTransaction ConstructTransaction(const UniValue& inputs_in, const UniVal
                 CAmount nAmount = AmountFromValue(output[name_]);
                 out.nValue = nAmount;
 
-                // SEQUENTIA: Allow fees in any asset
-                if (g_con_sequentiamode && output.exists("fee_asset")) {
+                if (g_con_any_asset_fees && output.exists("fee_asset")) {
+                    // Override policy asset for fee payment
                     out.nAsset = CAsset(ParseHashO(output, "fee_asset"));
                 }
                 out.scriptPubKey = CScript();

diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
@@ -1239,7 +1239,7 @@ UniValue AmountMapToUniv(const CAmountMap& balanceOrig, std::string strasset)
 {
     // Make sure the policyAsset is always present in the balance map.
     CAmountMap balance = balanceOrig;
-    if (!g_con_sequentiamode) {
+    if (!g_con_any_asset_fees) {
         balance[::policyAsset] += 0;
     }
 

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -884,7 +884,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
     int64_t nSigOpsCost = GetTransactionSigOpCost(tx, m_view, STANDARD_SCRIPT_VERIFY_FLAGS);
 
     CAsset feeAsset;
-    if (g_con_sequentiamode) {
+    if (g_con_any_asset_fees) {
         feeAsset = fee_map.begin()->first;
     } else {
         feeAsset = policyAsset;

diff --git a/src/wallet/receive.cpp b/src/wallet/receive.cpp
@@ -262,7 +262,7 @@ void CachedTxGetAmounts(const CWallet& wallet, const CWalletTx& wtx,
     if (mapDebit > CAmountMap()) // debit>0 means we signed/sent this transaction
     {
         CAmountMap feeMap = GetFeeMap(*wtx.tx);
-        nFeeAsset = g_con_sequentiamode ? feeMap.begin()->first : ::policyAsset;
+        nFeeAsset = g_con_any_asset_fees ? feeMap.begin()->first : ::policyAsset;
         nFee = -feeMap[nFeeAsset];
     }
 

diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
@@ -239,7 +239,7 @@ RPCHelpMan sendtoaddress()
     SetFeeEstimateMode(*pwallet, coin_control, /* conf_target */ request.params[6], /* estimate_mode */ request.params[7], /* fee_rate */ request.params[11], /* override_min_fee */ false);
 
     CAsset feeAsset = asset;
-    if (g_con_sequentiamode) {
+    if (g_con_any_asset_fees) {
         if (request.params.size() > 12 && request.params[12].isStr() && !request.params[12].get_str().empty()) {
             std::string strFeeAsset = request.params[12].get_str();
             feeAsset = GetAssetFromString(strFeeAsset);
@@ -596,7 +596,7 @@ void FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& fee_out,
         coinControl.fAllowWatchOnly = ParseIncludeWatchonly(NullUniValue, wallet);
     }
 
-    if (g_con_sequentiamode && options.exists("fee_asset")) {
+    if (g_con_any_asset_fees && options.exists("fee_asset")) {
         std::string strFeeAsset = options["fee_asset"].get_str();
         CAsset feeAsset = GetAssetFromString(strFeeAsset);
         if (feeAsset.IsNull()) {