refactor: move and rename GetBudgetSystemCollateralTX() to spend.cpp

kwvg · kwvg · commit 258cdc2d63cc · 2025-04-30T10:59:56.000Z
Need to move last `CreateTransaction` usage away from `wallet.cpp` so
that circular dependencies can be resolved in an upcoming commit.
`GetBudgetSystemCollateralTX()` is not a getter, it *generates* a
transaction, renaming to `GenBudgetSystemCollateralTx()`.
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
@@ -218,7 +218,7 @@ static RPCHelpMan gobject_prepare()
 
     CTransactionRef tx;
 
-    if (!wallet->GetBudgetSystemCollateralTX(tx, govobj.GetHash(), govobj.GetMinCollateralFee(), outpoint)) {
+    if (!wallet->GenBudgetSystemCollateralTx(tx, govobj.GetHash(), govobj.GetMinCollateralFee(), outpoint)) {
         std::string err = "Error making collateral transaction for governance object. Please check your wallet balance and make sure your wallet is unlocked.";
         if (!request.params[5].isNull() && !request.params[6].isNull()) {
             err += "Please verify your specified output is valid and is enough for the combined proposal fee and transaction fee.";
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
@@ -1059,3 +1059,28 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, int& nC
 
     return true;
 }
+
+bool CWallet::GenBudgetSystemCollateralTx(CTransactionRef& tx, uint256 hash, CAmount amount, const COutPoint& outpoint)
+{
+    CScript scriptChange;
+    scriptChange << OP_RETURN << ToByteVector(hash);
+
+    CAmount nFeeRet = 0;
+    int nChangePosRet = -1;
+    bilingual_str error;
+    std::vector< CRecipient > vecSend;
+    vecSend.push_back((CRecipient){scriptChange, amount, false});
+
+    CCoinControl coinControl;
+    if (!outpoint.IsNull()) {
+        coinControl.Select(outpoint);
+    }
+    FeeCalculation fee_calc_out;
+    bool success = CreateTransaction(vecSend, tx, nFeeRet, nChangePosRet, error, coinControl, fee_calc_out);
+    if(!success){
+        WalletLogPrintf("CWallet::GenBudgetSystemCollateralTx -- Error: %s\n", error.original);
+        return false;
+    }
+
+    return true;
+}
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2043,31 +2043,6 @@ bool CWallet::SignSpecialTxPayload(const uint256& hash, const CKeyID& keyid, std
     return false;
 }
 
-bool CWallet::GetBudgetSystemCollateralTX(CTransactionRef& tx, uint256 hash, CAmount amount, const COutPoint& outpoint)
-{
-    CScript scriptChange;
-    scriptChange << OP_RETURN << ToByteVector(hash);
-
-    CAmount nFeeRet = 0;
-    int nChangePosRet = -1;
-    bilingual_str error;
-    std::vector< CRecipient > vecSend;
-    vecSend.push_back((CRecipient){scriptChange, amount, false});
-
-    CCoinControl coinControl;
-    if (!outpoint.IsNull()) {
-        coinControl.Select(outpoint);
-    }
-    FeeCalculation fee_calc_out;
-    bool success = CreateTransaction(vecSend, tx, nFeeRet, nChangePosRet, error, coinControl, fee_calc_out);
-    if(!success){
-        WalletLogPrintf("CWallet::GetBudgetSystemCollateralTX -- Error: %s\n", error.original);
-        return false;
-    }
-
-    return true;
-}
-
 void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm)
 {
     LOCK(cs_wallet);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -674,7 +674,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
     float GetAverageAnonymizedRounds() const;
     CAmount GetNormalizedAnonymizedBalance() const;
 
-    bool GetBudgetSystemCollateralTX(CTransactionRef& tx, uint256 hash, CAmount amount, const COutPoint& outpoint=COutPoint()/*defaults null*/);
+    bool GenBudgetSystemCollateralTx(CTransactionRef& tx, uint256 hash, CAmount amount, const COutPoint& outpoint=COutPoint()/*defaults null*/);
     CAmount GetAvailableBalance(const CCoinControl* coinControl = nullptr) const;
 
     /**
