When any asset fees is enabled, use transaction asset for fee asset e…

…ven when options parameter is not provided
SequentiaSEQ · Apr 21, 2024 · c27b42c · c27b42c
1 parent c2d8a46
commit c27b42c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/wallet/rpc/spend.cpp b/src/wallet/rpc/spend.cpp
@@ -464,6 +464,9 @@ void FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& fee_out,
     bool lockUnspents = false;
     UniValue subtractFeeFromOutputs;
     std::set<int> setSubtractFeeFromOutputs;
+    if (g_con_any_asset_fees && !tx.vout.empty()) {
+        coinControl.m_fee_asset = tx.vout[0].nAsset.GetAsset();
+    }
 
     if (!options.isNull()) {
       if (options.type() == UniValue::VBOOL) {
@@ -516,8 +519,6 @@ void FundTransaction(CWallet& wallet, CMutableTransaction& tx, CAmount& fee_out,
                     throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Unknown label and invalid asset hex for fee: %s", feeAsset.GetHex()));
                 }
                 coinControl.m_fee_asset = feeAsset;
-            } else {
-                coinControl.m_fee_asset = tx.vout[0].nAsset.GetAsset();
             }
         }