Fix fund raw transaction rpc

qtumproject · Oct 16, 2024 · e264f63 · e264f63
1 parent c9c8ac3
commit e264f63
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
@@ -1480,7 +1480,7 @@ util::Result<CreatedTransactionResult> FundTransaction(CWallet& wallet, const CM
         preset_txin.SetScriptWitness(txin.scriptWitness);
     }
 
-    CAmount nGasFee = wallet.GetTxGasFee(tx);
+    CAmount nGasFee = wallet.GetTxGasFee(vecSend);
     auto res = CreateTransaction(wallet, vecSend, change_pos, coinControl, false, nGasFee);
     if (!res) {
         return res;

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -5666,4 +5666,15 @@ CAmount CWallet::GetTxGasFee(const CMutableTransaction& tx)
     }
     return 0;
 }
+
+CAmount CWallet::GetTxGasFee(const std::vector<CRecipient>& vecSend)
+{
+    CMutableTransaction txNew;
+    for (const auto& recipient : vecSend)
+    {
+        CTxOut txout(recipient.nAmount, GetScriptForDestination(recipient.dest));
+        txNew.vout.push_back(txout);
+    }
+    return GetTxGasFee(txNew);
+}
 } // namespace wallet
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -770,6 +770,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
         EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
 
     CAmount GetTxGasFee(const CMutableTransaction& tx);
+    CAmount GetTxGasFee(const std::vector<CRecipient>& vecSend);
 
     bool ImportScripts(const std::set<CScript> scripts, int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool ImportPrivKeys(const std::map<CKeyID, CKey>& privkey_map, const int64_t timestamp) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);