Bugfix: get fee asset from transaction rather than non-existent mem p…

…ool entry
SequentiaSEQ · Apr 23, 2024 · a6b3d08 · a6b3d08
1 parent 8e6666b
commit a6b3d08
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp
@@ -76,7 +76,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t
                 if (result.m_result_type != MempoolAcceptResult::ResultType::VALID) {
                     return HandleATMPError(result.m_state, err_string);
                 } else if (g_con_any_asset_fees) {
-                    CAmount mBaseFeesValue = node.mempool->mapTx.find(txid)->GetFeeValue();
+                    CAmount mBaseFeesValue = ExchangeRateMap::GetInstance().CalculateExchangeValue(result.m_base_fees.value(), tx->GetFeeAsset(::policyAsset));
                     if (mBaseFeesValue > max_tx_fee) {
                         return TransactionError::MAX_FEE_EXCEEDED;
                     }

diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -580,6 +580,17 @@ class CTransaction
     {
         return !witness.IsNull();
     }
+
+    const CAsset& GetFeeAsset(CAsset& default_asset) const 
+    {
+        CAsset& feeAsset = default_asset;
+        for (size_t i = 0; i < vout.size(); i++) {
+            if (vout[i].IsFee()) { 
+                feeAsset = vout[i].nAsset.GetAsset();
+            }
+        }
+        return feeAsset;
+    }
 };
 
 /** A mutable version of CTransaction. */