fixup: for wallet dust combiner

Author: domob1812

divi/src/CoinControlSelectionAlgorithm.cpp

@@ -1,10 +1,12 @@
 #include <CoinControlSelectionAlgorithm.h>
 #include <coincontrol.h>
+#include <wallet.h>
 #include <WalletTx.h>
 
 CoinControlSelectionAlgorithm::CoinControlSelectionAlgorithm(
-    const CCoinControl* coinControl
-    ): coinControl_(coinControl)
+    const CCoinControl* coinControl,
+    const CWallet& wallet
+    ): coinControl_(coinControl), wallet_(wallet)
 {
 }
 
@@ -20,7 +22,7 @@ std::set<COutput> CoinControlSelectionAlgorithm::SelectCoins(
         for(const COutput& out: vCoins)
         {
             if (!out.fSpendable ||
-                (!coinControl_->fAllowOtherInputs && !coinControl_->IsSelected(out.tx->GetHash(),out.i)))
+                (!coinControl_->fAllowOtherInputs && !coinControl_->IsSelected(wallet_.GetUtxoHash(*out.tx),out.i)))
             {
                 continue;
             }
@@ -31,4 +33,4 @@ std::set<COutput> CoinControlSelectionAlgorithm::SelectCoins(
     }
     fees = totalInputs - transactionToSelectCoinsFor.GetValueOut();
     return setCoinsRet;
-}
+}

divi/src/CoinControlSelectionAlgorithm.h

@@ -2,16 +2,19 @@
 #define COIN_CONTROL_COIN_SELECTOR_H
 #include <I_CoinSelectionAlgorithm.h>
 class CCoinControl;
+class CWallet;
 class CoinControlSelectionAlgorithm: public I_CoinSelectionAlgorithm
 {
 private:
     const CCoinControl* coinControl_;
+    const CWallet& wallet_;
 public:
-    CoinControlSelectionAlgorithm(
-        const CCoinControl* coinControl);
+    explicit CoinControlSelectionAlgorithm(
+        const CCoinControl* coinControl,
+        const CWallet& wallet);
     virtual std::set<COutput> SelectCoins(
         const CMutableTransaction& transactionToSelectCoinsFor,
         const std::vector<COutput>& vCoins,
         CAmount& fees) const;
 };
-#endif// COIN_CONTROL_COIN_SELECTOR_H
+#endif// COIN_CONTROL_COIN_SELECTOR_H

divi/src/walletdustcombiner.cpp

@@ -69,7 +69,7 @@ void WalletDustCombiner::CombineDust(CAmount combineThreshold)
             if (out.Value() > combineThreshold * COIN)
                 continue;
 
-            COutPoint outpt(out.tx->GetHash(), out.i);
+            COutPoint outpt(wallet_.GetUtxoHash(*out.tx), out.i);
             coinControl->Select(outpt);
             coinsToCombine.push_back(out);
             nTotalRewardsValue += out.Value();
@@ -92,7 +92,7 @@ void WalletDustCombiner::CombineDust(CAmount combineThreshold)
         CWalletTx wtx;
         std::pair<std::string,bool> txCreationResult;
         {
-            CoinControlSelectionAlgorithm coinSelectionAlgorithm(coinControl);
+            CoinControlSelectionAlgorithm coinSelectionAlgorithm(coinControl, wallet_);
             txCreationResult = wallet_.SendMoney(vecSend, wtx, ALL_SPENDABLE_COINS,&coinSelectionAlgorithm);
         }
         delete coinControl;
@@ -115,4 +115,4 @@ void combineWalletDust(const Settings& settings)
                 settings.GetArg("-combinethreshold",std::numeric_limits<int64_t>::max() ) );
         }
     }
-}
+}