Prevent multiple calls to CWallet::AvailableCoins

João Barbosa · João Barbosa · commit bb16c8894bec · 2016-03-22T08:43:37.000Z
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1841,10 +1841,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int
     return true;
 }
 
-bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl) const
+bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, set<pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl* coinControl) const
 {
-    vector<COutput> vCoins;
-    AvailableCoins(vCoins, true, coinControl);
+    vector<COutput> vCoins(vAvailableCoins);
 
     // coin control -> return all selected outputs (we want all selected to go into the transaction for sure)
     if (coinControl && coinControl->HasSelected() && !coinControl->fAllowOtherInputs)
@@ -2010,6 +2009,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     {
         LOCK2(cs_main, cs_wallet);
         {
+            std::vector<COutput> vAvailableCoins;
+            AvailableCoins(vAvailableCoins, true, coinControl);
+
             nFeeRet = 0;
             // Start with no fee and loop until there is enough fee
             while (true)
@@ -2059,7 +2061,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 // Choose coins to use
                 set<pair<const CWalletTx*,unsigned int> > setCoins;
                 CAmount nValueIn = 0;
-                if (!SelectCoins(nValueToSelect, setCoins, nValueIn, coinControl))
+                if (!SelectCoins(vAvailableCoins, nValueToSelect, setCoins, nValueIn, coinControl))
                 {
                     strFailReason = _("Insufficient funds");
                     return false;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -544,7 +544,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
      * all coins from coinControl are selected; Never select unconfirmed coins
      * if they are not ours
      */
-    bool SelectCoins(const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl *coinControl = NULL) const;
+    bool SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl *coinControl = NULL) const;
 
     CWalletDB *pwalletdbEncryption;
 

Original file line number	Diff line number	Diff line change
`@@ -1841,10 +1841,9 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int`
`1841`	`1841`	`return true;`
`1842`	`1842`	`}`
`1843`	`1843`
`1844`		`-bool CWallet::SelectCoins(const CAmount& nTargetValue, set<pair<const CWalletTx,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl coinControl) const`
	`1844`	`+bool CWallet::SelectCoins(const vector<COutput>& vAvailableCoins, const CAmount& nTargetValue, set<pair<const CWalletTx,unsigned int> >& setCoinsRet, CAmount& nValueRet, const CCoinControl coinControl) const`
`1845`	`1845`	`{`
`1846`		`- vector<COutput> vCoins;`
`1847`		`- AvailableCoins(vCoins, true, coinControl);`
	`1846`	`+ vector<COutput> vCoins(vAvailableCoins);`
`1848`	`1847`
`1849`	`1848`	`// coin control -> return all selected outputs (we want all selected to go into the transaction for sure)`
`1850`	`1849`	`if (coinControl && coinControl->HasSelected() && !coinControl->fAllowOtherInputs)`
`@@ -2010,6 +2009,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt`
`2010`	`2009`	`{`
`2011`	`2010`	`LOCK2(cs_main, cs_wallet);`
`2012`	`2011`	`{`
	`2012`	`+ std::vector<COutput> vAvailableCoins;`
	`2013`	`+ AvailableCoins(vAvailableCoins, true, coinControl);`
	`2014`	`+`
`2013`	`2015`	`nFeeRet = 0;`
`2014`	`2016`	`// Start with no fee and loop until there is enough fee`
`2015`	`2017`	`while (true)`
`@@ -2059,7 +2061,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt`
`2059`	`2061`	`// Choose coins to use`
`2060`	`2062`	`set<pair<const CWalletTx*,unsigned int> > setCoins;`
`2061`	`2063`	`CAmount nValueIn = 0;`
`2062`		`- if (!SelectCoins(nValueToSelect, setCoins, nValueIn, coinControl))`
	`2064`	`+ if (!SelectCoins(vAvailableCoins, nValueToSelect, setCoins, nValueIn, coinControl))`
`2063`	`2065`	`{`
`2064`	`2066`	`strFailReason = _("Insufficient funds");`
`2065`	`2067`	`return false;`