remove config option and apply for policy asset

Tom Trevethan · Tom Trevethan · commit 15d09d09ad11 · 2025-09-10T15:21:30.000+01:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -898,8 +898,6 @@ class CCustomParams : public CRegTestParams {
         std::vector<unsigned char> man_bytes = ParseHex(args.GetArg("-con_mandatorycoinbase", ""));
         consensus.mandatory_coinbase_destination = CScript(man_bytes.begin(), man_bytes.end()); // Blank script allows any coinbase destination
 
-        consensus.allow_any_fee = args.GetBoolArg("-con_allow_any_fee", consensus.allow_any_fee);
-
         // Custom chains connect coinbase outputs to db by default
         consensus.connect_genesis_outputs = args.GetIntArg("-con_connect_genesis_outputs", true);
 
@@ -1517,8 +1515,6 @@ class CLiquidV1TestParams : public CLiquidV1Params {
             consensus.mandatory_coinbase_destination = CScript(man_bytes.begin(), man_bytes.end()); // Blank script allows any coinbase destination
         }
 
-        consensus.allow_any_fee = args.GetBoolArg("-con_allow_any_fee", consensus.allow_any_fee);
-
         consensus.connect_genesis_outputs = args.GetIntArg("-con_connect_genesis_outputs", consensus.connect_genesis_outputs);
 
         initialFreeCoins = args.GetIntArg("-initialfreecoins", initialFreeCoins);
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -45,7 +45,6 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
     argsman.AddArg("-con_signed_blocks", "Signed blockchain. Uses input of `-signblockscript` to define what signatures are necessary to solve it.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-signblockscript", "Signed blockchain enumberance. Only active when `-con_signed_blocks` set to true.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-con_max_block_sig_size", "Max allowed witness data for the signed block header.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
-    argsman.AddArg("-con_allow_any_fee", "Allow any fee value for any asset", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
 
     argsman.AddArg("-con_has_parent_chain", "Whether or not there is a parent chain.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     argsman.AddArg("-parentgenesisblockhash", "The genesis blockhash of the parent chain.", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
diff --git a/src/confidential_validation.cpp b/src/confidential_validation.cpp
@@ -1,4 +1,5 @@
 
+#include <chainparams.h>
 #include <confidential_validation.h>
 #include <issuance.h>
 #include <pegins.h>
@@ -24,20 +25,20 @@ class CSecp256k1Init {
 static CSecp256k1Init instance_of_csecp256k1;
 }
 
-bool HasValidFee(const CTransaction& tx, bool allow_any_fee) {
+bool HasValidFee(const CTransaction& tx) {
     CAmountMap totalFee;
     for (unsigned int i = 0; i < tx.vout.size(); i++) {
         CAmount fee = 0;
-        if (tx.vout[i].IsFee()) {
+        if (tx.vout[i].IsFee() && tx.vout[i].nAsset.GetAsset() == Params().GetConsensus().pegged_asset) {
             fee = tx.vout[i].nValue.GetAmount();
-            if (!allow_any_fee && (fee == 0 || !MoneyRange(fee))) {
+            if (fee == 0 || !MoneyRange(fee)) {
                 return false;
             }
             totalFee[tx.vout[i].nAsset.GetAsset()] += fee;
-            if (!allow_any_fee && !MoneyRange(totalFee)) {
+            if (!MoneyRange(totalFee)) {
                 return false;
             }
-            if(allow_any_fee && fee < 0) {
+            if(fee < 0) {
                 return false;
             }
         }
diff --git a/src/confidential_validation.h b/src/confidential_validation.h
@@ -15,7 +15,7 @@
 
 
 // Check if explicit TX fees overflow or are negative
-bool HasValidFee(const CTransaction& tx, bool allow_any_fee);
+bool HasValidFee(const CTransaction& tx);
 
 // Compute the fee from the explicit fee outputs. Must call HasValidFee first
 CAmountMap GetFeeMap(const CTransaction& tx);
diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -175,7 +175,6 @@ struct Params {
     size_t total_valid_epochs = 1;
     bool elements_mode = false;
     bool start_p2wsh_script = false;
-    bool allow_any_fee = false;
 };
 
 } // namespace Consensus
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -14,6 +14,7 @@
 #include <script/interpreter.h>
 #include <script/pegins.h>
 #include <util/moneystr.h>
+#include <chainparams.h>
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {
@@ -192,7 +193,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
     return nSigOps;
 }
 
-bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight, CAmountMap& fee_map, std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, std::vector<CCheck*> *pvChecks, const bool cacheStore, bool fScriptChecks, const std::vector<std::pair<CScript, CScript>>& fedpegscripts, bool allow_any_fee)
+bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight, CAmountMap& fee_map, std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, std::vector<CCheck*> *pvChecks, const bool cacheStore, bool fScriptChecks, const std::vector<std::pair<CScript, CScript>>& fedpegscripts)
 {
     // are the actual inputs available?
     if (!inputs.HaveInputs(tx)) {
@@ -245,7 +246,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state,
 
     if (g_con_elementsmode) {
         // Tally transaction fees
-        if (!HasValidFee(tx, allow_any_fee)) {
+        if (!HasValidFee(tx)) {
             return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-fee-outofrange");
         }
 
@@ -254,7 +255,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state,
             return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-in-ne-out", "value in != value out");
         }
         fee_map += GetFeeMap(tx);
-        if (allow_any_fee && !MoneyRange(fee_map)) {
+        if (!MoneyRange(fee_map[::Params().GetConsensus().pegged_asset])) {
             return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-block-total-fee-outofrange");
         }
     } else {
diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h
@@ -28,7 +28,7 @@ namespace Consensus {
  * @param[out] fee_map Set to the transaction fee if successful.
  * Preconditions: tx.IsCoinBase() is false.
  */
-[[nodiscard] ]bool CheckTxInputs(const CTransaction& tx, TxValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight, CAmountMap& fee_map, std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, std::vector<CCheck*> *pvChecks, const bool cacheStore, bool fScriptChecks, const std::vector<std::pair<CScript, CScript>>& fedpegscripts, bool allow_any_fee);
+[[nodiscard] ]bool CheckTxInputs(const CTransaction& tx, TxValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight, CAmountMap& fee_map, std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, std::vector<CCheck*> *pvChecks, const bool cacheStore, bool fScriptChecks, const std::vector<std::pair<CScript, CScript>>& fedpegscripts);
 } // namespace Consensus
 
 /** Auxiliary functions for transaction validation (ideally should not be exposed) */
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
@@ -252,7 +252,7 @@ FUZZ_TARGET_INIT(coins_view, initialize_coins_view)
                 }
                 std::vector<std::pair<CScript, CScript>> fedpegscripts; // ELEMENTS: we ought to populate this and have a more useful fuzztest
                 std::set<std::pair<uint256, COutPoint> > setPeginsSpent;
-                if (Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_map, setPeginsSpent, NULL, false, true, fedpegscripts, false)) {
+                if (Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_map, setPeginsSpent, NULL, false, true, fedpegscripts)) {
                     assert(MoneyRange(tx_fee_map));
                 }
             },
diff --git a/src/test/pegin_witness_tests.cpp b/src/test/pegin_witness_tests.cpp
@@ -123,15 +123,15 @@ BOOST_AUTO_TEST_CASE(witness_valid)
     CCoinsViewCache coins(&coinsDummy);
     // Get the latest block index to look up fedpegscripts
     // For these tests, should be genesis-block-hardcoded consensus.fedpegscript
-    BOOST_CHECK(Consensus::CheckTxInputs(tx, state, coins, 0, fee_map, setPeginsSpent, NULL, false, true, fedpegscripts, false));
+    BOOST_CHECK(Consensus::CheckTxInputs(tx, state, coins, 0, fee_map, setPeginsSpent, NULL, false, true, fedpegscripts));
     BOOST_CHECK(setPeginsSpent.size() == 1);
     setPeginsSpent.clear();
 
     // Strip pegin_witness
     CMutableTransaction mtxn(tx);
     mtxn.witness.vtxinwit[0].m_pegin_witness.SetNull();
     CTransaction tx2(mtxn);
-    BOOST_CHECK(!Consensus::CheckTxInputs(tx2, state, coins, 0, fee_map, setPeginsSpent, NULL, false, true, fedpegscripts, false));
+    BOOST_CHECK(!Consensus::CheckTxInputs(tx2, state, coins, 0, fee_map, setPeginsSpent, NULL, false, true, fedpegscripts));
     BOOST_CHECK(setPeginsSpent.empty());
 
     // Invalidate peg-in (and spending) authorization by pegin marker.
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(witness_valid)
     CMutableTransaction mtxn2(tx);
     mtxn2.vin[0].m_is_pegin = false;
     CTransaction tx3(mtxn2);
-    BOOST_CHECK(!Consensus::CheckTxInputs(tx3, state, coins, 0, fee_map, setPeginsSpent, NULL, false, true, fedpegscripts, false));
+    BOOST_CHECK(!Consensus::CheckTxInputs(tx3, state, coins, 0, fee_map, setPeginsSpent, NULL, false, true, fedpegscripts));
     BOOST_CHECK(setPeginsSpent.empty());
 
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -895,7 +895,7 @@ void CTxMemPool::check(const CBlockIndex* active_chain_tip, const CCoinsViewCach
         const auto& fedpegscripts = GetValidFedpegScripts(active_chain_tip, Params().GetConsensus(), true /* nextblock_validation */);
         bool cacheStore = true;
         bool fScriptChecks = true;
-        assert(Consensus::CheckTxInputs(tx, dummy_state, mempoolDuplicate, spendheight, fee_map, setPeginsSpent, nullptr, cacheStore, fScriptChecks, fedpegscripts, Params().GetConsensus().allow_any_fee));
+        assert(Consensus::CheckTxInputs(tx, dummy_state, mempoolDuplicate, spendheight, fee_map, setPeginsSpent, nullptr, cacheStore, fScriptChecks, fedpegscripts));
         for (const auto& input: tx.vin) mempoolDuplicate.SpendCoin(input.prevout);
         AddCoins(mempoolDuplicate, tx, std::numeric_limits<int>::max());
     }
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -855,12 +855,10 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
 
     // The mempool holds txs for the next block, so pass height+1 to CheckTxInputs
     CAmountMap fee_map;
-    if (!Consensus::CheckTxInputs(tx, state, m_view, m_active_chainstate.m_chain.Height() + 1, fee_map, setPeginsSpent, NULL, true, true, fedpegscripts, Params().GetConsensus().allow_any_fee)) {
+    if (!Consensus::CheckTxInputs(tx, state, m_view, m_active_chainstate.m_chain.Height() + 1, fee_map, setPeginsSpent, NULL, true, true, fedpegscripts)) {
         return false; // state filled in by CheckTxInputs
     }
 
-    LogPrintf("mand coin: %u\n", Params().GetConsensus().allow_any_fee);
-
     // ELEMENTS: extra policy check for consistency between issuances and their rangeproof
     if (fRequireStandard) {
         for (unsigned i = 0; i < std::min(tx.witness.vtxinwit.size(), tx.vin.size()); i++) {
@@ -2352,7 +2350,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
             TxValidationState tx_state;
             if (!Consensus::CheckTxInputs(tx, tx_state, view, pindex->nHeight, fee_map,
                         setPeginsSpent == NULL ? setPeginsSpentDummy : *setPeginsSpent,
-                        g_parallel_script_checks ? &vChecks : NULL, fCacheResults, fScriptChecks, fedpegscripts, Params().GetConsensus().allow_any_fee)) {
+                        g_parallel_script_checks ? &vChecks : NULL, fCacheResults, fScriptChecks, fedpegscripts)) {
                 // Any transaction validation failure in ConnectBlock is a block consensus failure
                 state.Invalid(BlockValidationResult::BLOCK_CONSENSUS,
                         tx_state.GetRejectReason(), tx_state.GetDebugMessage());
diff --git a/src/wallet/rpc/transactions.cpp b/src/wallet/rpc/transactions.cpp
@@ -823,7 +823,7 @@ RPCHelpMan gettransaction()
     CAmountMap nCredit = CachedTxGetCredit(*pwallet, wtx, filter);
     CAmountMap nDebit = CachedTxGetDebit(*pwallet, wtx, filter);
     CAmountMap nNet = nCredit - nDebit;
-    CHECK_NONFATAL(HasValidFee(*wtx.tx,Params().GetConsensus().allow_any_fee));
+    CHECK_NONFATAL(HasValidFee(*wtx.tx));
     CAmountMap nFee = CachedTxIsFromMe(*pwallet, wtx, filter) ? CAmountMap() - GetFeeMap(*wtx.tx) : CAmountMap();
     if (!g_con_elementsmode) {
         CAmount total_out = 0;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`
	`2`	`+#include <chainparams.h>`
`2`	`3`	`#include <confidential_validation.h>`
`3`	`4`	`#include <issuance.h>`
`4`	`5`	`#include <pegins.h>`
`@@ -24,20 +25,20 @@ class CSecp256k1Init {`
`24`	`25`	`static CSecp256k1Init instance_of_csecp256k1;`
`25`	`26`	`}`
`26`	`27`
`27`		`-bool HasValidFee(const CTransaction& tx, bool allow_any_fee) {`
	`28`	`+bool HasValidFee(const CTransaction& tx) {`
`28`	`29`	`CAmountMap totalFee;`
`29`	`30`	`for (unsigned int i = 0; i < tx.vout.size(); i++) {`
`30`	`31`	`CAmount fee = 0;`
`31`		`- if (tx.vout[i].IsFee()) {`
	`32`	`+ if (tx.vout[i].IsFee() && tx.vout[i].nAsset.GetAsset() == Params().GetConsensus().pegged_asset) {`
`32`	`33`	`fee = tx.vout[i].nValue.GetAmount();`
`33`		`- if (!allow_any_fee && (fee == 0 \|\| !MoneyRange(fee))) {`
	`34`	`+ if (fee == 0 \|\| !MoneyRange(fee)) {`
`34`	`35`	`return false;`
`35`	`36`	`}`
`36`	`37`	`totalFee[tx.vout[i].nAsset.GetAsset()] += fee;`
`37`		`- if (!allow_any_fee && !MoneyRange(totalFee)) {`
	`38`	`+ if (!MoneyRange(totalFee)) {`
`38`	`39`	`return false;`
`39`	`40`	`}`
`40`		`- if(allow_any_fee && fee < 0) {`
	`41`	`+ if(fee < 0) {`
`41`	`42`	`return false;`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include <script/interpreter.h>`
`15`	`15`	`#include <script/pegins.h>`
`16`	`16`	`#include <util/moneystr.h>`
	`17`	`+#include <chainparams.h>`
`17`	`18`
`18`	`19`	`bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)`
`19`	`20`	`{`
`@@ -192,7 +193,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i`
`192`	`193`	`return nSigOps;`
`193`	`194`	`}`
`194`	`195`
`195`		`-bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight, CAmountMap& fee_map, std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, std::vector<CCheck> pvChecks, const bool cacheStore, bool fScriptChecks, const std::vector<std::pair<CScript, CScript>>& fedpegscripts, bool allow_any_fee)`
	`196`	`+bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state, const CCoinsViewCache& inputs, int nSpendHeight, CAmountMap& fee_map, std::set<std::pair<uint256, COutPoint>>& setPeginsSpent, std::vector<CCheck> pvChecks, const bool cacheStore, bool fScriptChecks, const std::vector<std::pair<CScript, CScript>>& fedpegscripts)`
`196`	`197`	`{`
`197`	`198`	`// are the actual inputs available?`
`198`	`199`	`if (!inputs.HaveInputs(tx)) {`
`@@ -245,7 +246,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state,`
`245`	`246`
`246`	`247`	`if (g_con_elementsmode) {`
`247`	`248`	`// Tally transaction fees`
`248`		`- if (!HasValidFee(tx, allow_any_fee)) {`
	`249`	`+ if (!HasValidFee(tx)) {`
`249`	`250`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-fee-outofrange");`
`250`	`251`	`}`
`251`	`252`
`@@ -254,7 +255,7 @@ bool Consensus::CheckTxInputs(const CTransaction& tx, TxValidationState& state,`
`254`	`255`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-in-ne-out", "value in != value out");`
`255`	`256`	`}`
`256`	`257`	`fee_map += GetFeeMap(tx);`
`257`		`- if (allow_any_fee && !MoneyRange(fee_map)) {`
	`258`	`+ if (!MoneyRange(fee_map[::Params().GetConsensus().pegged_asset])) {`
`258`	`259`	`return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-block-total-fee-outofrange");`
`259`	`260`	`}`
`260`	`261`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ FUZZ_TARGET_INIT(coins_view, initialize_coins_view)`
`252`	`252`	`}`
`253`	`253`	`std::vector<std::pair<CScript, CScript>> fedpegscripts; // ELEMENTS: we ought to populate this and have a more useful fuzztest`
`254`	`254`	`std::set<std::pair<uint256, COutPoint> > setPeginsSpent;`
`255`		`- if (Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_map, setPeginsSpent, NULL, false, true, fedpegscripts, false)) {`
	`255`	`+ if (Consensus::CheckTxInputs(transaction, state, coins_view_cache, fuzzed_data_provider.ConsumeIntegralInRange<int>(0, std::numeric_limits<int>::max()), tx_fee_map, setPeginsSpent, NULL, false, true, fedpegscripts)) {`
`256`	`256`	`assert(MoneyRange(tx_fee_map));`
`257`	`257`	`}`
`258`	`258`	`},`
Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ void CTxMemPool::check(const CBlockIndex* active_chain_tip, const CCoinsViewCach`
`895`	`895`	`const auto& fedpegscripts = GetValidFedpegScripts(active_chain_tip, Params().GetConsensus(), true /* nextblock_validation */);`
`896`	`896`	`bool cacheStore = true;`
`897`	`897`	`bool fScriptChecks = true;`
`898`		`- assert(Consensus::CheckTxInputs(tx, dummy_state, mempoolDuplicate, spendheight, fee_map, setPeginsSpent, nullptr, cacheStore, fScriptChecks, fedpegscripts, Params().GetConsensus().allow_any_fee));`
	`898`	`+ assert(Consensus::CheckTxInputs(tx, dummy_state, mempoolDuplicate, spendheight, fee_map, setPeginsSpent, nullptr, cacheStore, fScriptChecks, fedpegscripts));`
`899`	`899`	`for (const auto& input: tx.vin) mempoolDuplicate.SpendCoin(input.prevout);`
`900`	`900`	`AddCoins(mempoolDuplicate, tx, std::numeric_limits<int>::max());`
`901`	`901`	`}`