Use UTXO hasher in VaultManager.

The VaultManager class needs a TransactionUtxoHasher instance so that
it can properly track spent outputs with the outputTracker_.  This adds
a reference to the UTXO hasher to the instance and uses it in the
proper place.

Author: domob1812

divi/src/VaultManager.cpp

@@ -5,6 +5,7 @@
 #include <WalletTx.h>
 #include <WalletTransactionRecord.h>
 #include <SpentOutputTracker.h>
+#include <UtxoCheckingAndUpdating.h>
 #include <I_VaultManagerDatabase.h>
 #include <I_MerkleTxConfirmationNumberCalculator.h>
 #include <Logging.h>
@@ -13,8 +14,10 @@ constexpr const char* VAULT_DEPOSIT_DESCRIPTION = "isVaultDeposit";
 
 VaultManager::VaultManager(
     const I_MerkleTxConfirmationNumberCalculator& confirmationsCalculator,
+    const TransactionUtxoHasher& utxoHasher,
     I_VaultManagerDatabase& vaultManagerDB
     ): confirmationsCalculator_(confirmationsCalculator)
+    , utxoHasher_(utxoHasher)
     , vaultManagerDB_(vaultManagerDB)
     , cs_vaultManager_()
     , transactionOrderingIndex_(0)
@@ -222,7 +225,6 @@ UnspentOutputs VaultManager::getManagedUTXOs(VaultUTXOFilters filter) const
     auto managedScriptsLimitsCopy = managedScripts_;
     for(const auto& hashAndTransaction: walletTxRecord_->mapWallet)
     {
-        uint256 hash = hashAndTransaction.first;
         const CWalletTx& tx = hashAndTransaction.second;
         if(!( (allInputsAreKnown(tx) && tx.IsCoinStake()) || tx.mapValue.count(VAULT_DEPOSIT_DESCRIPTION) > 0 )) continue;
 
@@ -236,6 +238,7 @@ UnspentOutputs VaultManager::getManagedUTXOs(VaultUTXOFilters filter) const
         if( (filter & VaultUTXOFilters::MATURED) > 0 && blocksTillMaturity > 0 ) continue;
         if( (filter & VaultUTXOFilters::INMATURE) > 0 && blocksTillMaturity < 1 ) continue;
 
+        const uint256 hash = utxoHasher_.GetUtxoHash(tx);
         for(unsigned outputIndex = 0; outputIndex < tx.vout.size(); ++outputIndex)
         {
             const CTxOut& output = tx.vout[outputIndex];

divi/src/VaultManager.h

@@ -14,6 +14,7 @@ using UnspentOutputs = std::vector<COutput>;
 class CTransaction;
 class CBlock;
 class CWalletTx;
+class TransactionUtxoHasher;
 class uint256;
 class CTxOut;
 
@@ -38,6 +39,7 @@ class VaultManager
     I_VaultManagerDatabase& vaultManagerDB_;
     mutable CCriticalSection cs_vaultManager_;
     uint64_t transactionOrderingIndex_;
+    const TransactionUtxoHasher& utxoHasher_;
     std::unique_ptr<WalletTransactionRecord> walletTxRecord_;
     std::unique_ptr<SpentOutputTracker> outputTracker_;
     ManagedScripts managedScripts_;
@@ -51,6 +53,7 @@ class VaultManager
 public:
     VaultManager(
         const I_MerkleTxConfirmationNumberCalculator& confirmationsCalculator,
+        const TransactionUtxoHasher& utxoHasher,
         I_VaultManagerDatabase& vaultManagerDB);
     ~VaultManager();
 

divi/src/test/VaultManager_tests.cpp

@@ -7,6 +7,7 @@
 #include <FakeBlockIndexChain.h>
 #include <primitives/block.h>
 #include <chain.h>
+#include <MockUtxoHasher.h>
 #include <MockVaultManagerDatabase.h>
 #include <WalletTx.h>
 #include <streams.h>
@@ -21,6 +22,7 @@ using ::testing::Invoke;
 struct VaultManagerTestFixture
 {
 public:
+    MockUtxoHasher utxoHasher;
     std::unique_ptr<NiceMock<MockVaultManagerDatabase>> mockPtr;
     std::unique_ptr<FakeBlockIndexWithHashes> fakeBlockIndexWithHashesResource;
     std::unique_ptr<I_MerkleTxConfirmationNumberCalculator> confirmationsCalculator;
@@ -36,7 +38,7 @@ struct VaultManagerTestFixture
                 *(fakeBlockIndexWithHashesResource->blockIndexByHash)
             ))
         , scriptGenerator()
-        , manager( new VaultManager(*confirmationsCalculator,*mockPtr ))
+        , manager( new VaultManager(*confirmationsCalculator, utxoHasher, *mockPtr))
     {
     }
     ~VaultManagerTestFixture()
@@ -190,7 +192,7 @@ BOOST_AUTO_TEST_CASE(willDiscountSpentUTXOs)
     manager->addTransaction(tx,&blockMiningFirstTx, true);
 
     CMutableTransaction otherTx;
-    otherTx.vin.emplace_back( COutPoint(tx.GetHash(), 1u) );
+    otherTx.vin.emplace_back( COutPoint(utxoHasher.GetUtxoHash(tx), 1u) );
     otherTx.vout.push_back(CTxOut(100,managedScript));
     otherTx.vout.push_back(CTxOut(100,managedScript));
     otherTx.vout.push_back(CTxOut(100,managedScript));
@@ -245,7 +247,7 @@ BOOST_AUTO_TEST_CASE(willCheckThatCoinstakeTransactionsAreDeepEnoughToSpend)
     manager->addTransaction(fundingTransaction,&blockMiningFundingTx, true);
 
     CMutableTransaction tx;
-    tx.vin.push_back(CTxIn(fundingTransaction.GetHash(),0u));
+    tx.vin.push_back(CTxIn(utxoHasher.GetUtxoHash(fundingTransaction),0u));
     CTxOut emptyFirstOutput;
     emptyFirstOutput.SetEmpty();
     tx.vout.push_back(emptyFirstOutput);
@@ -271,7 +273,7 @@ BOOST_AUTO_TEST_CASE(willLoadTransactionsFromDatabase)
     dummyTransaction.vout.push_back(CTxOut(100,scriptGenerator(10)));
 
     CMutableTransaction tx;
-    tx.vin.push_back(CTxIn(dummyTransaction.GetHash(),0u));
+    tx.vin.push_back(CTxIn(utxoHasher.GetUtxoHash(dummyTransaction),0u));
     tx.vout.push_back(CTxOut(100,managedScript));
     tx.vout.push_back(CTxOut(100,managedScript));
     tx.vout.push_back(CTxOut(100,managedScript));
@@ -309,7 +311,7 @@ BOOST_AUTO_TEST_CASE(willLoadTransactionsFromDatabase)
             return true;
         }
     ));
-    manager.reset(new VaultManager(*confirmationsCalculator, *mockPtr ));
+    manager.reset(new VaultManager(*confirmationsCalculator, utxoHasher, *mockPtr ));
 
     BOOST_CHECK_EQUAL(manager->getManagedUTXOs().size(), 4u);
     BOOST_CHECK(expectedTx==manager->getTransaction(tx.GetHash()));
@@ -329,7 +331,7 @@ BOOST_AUTO_TEST_CASE(willLoadManyTransactionsFromDatabase)
         CMutableTransaction dummyTransaction;
         dummyTransaction.vout.push_back(CTxOut(100,scriptGenerator(10)));
         CMutableTransaction tx;
-        tx.vin.push_back(CTxIn(dummyTransaction.GetHash(),0u));
+        tx.vin.push_back(CTxIn(utxoHasher.GetUtxoHash(dummyTransaction),0u));
         tx.vout.push_back(CTxOut(randomSentAmount,scriptGenerator(10)));
 
         dummyTransactions.emplace_back(tx);
@@ -352,7 +354,7 @@ BOOST_AUTO_TEST_CASE(willLoadManyTransactionsFromDatabase)
             return false;
         }
     ));
-    manager.reset(new VaultManager(*confirmationsCalculator, *mockPtr ));
+    manager.reset(new VaultManager(*confirmationsCalculator, utxoHasher, *mockPtr ));
 
     for(unsigned txCount =0 ; txCount < 10u; ++txCount)
     {
@@ -698,7 +700,7 @@ BOOST_AUTO_TEST_CASE(willUpdatingDepositStatusWillPersist)
     manager->addTransaction(tx,&blockMiningFirstTx, true);
     BOOST_CHECK_EQUAL(manager->getTransaction(tx.GetHash()).mapValue.count("isVaultDeposit"),1u);
 
-    manager.reset( new VaultManager(*confirmationsCalculator,*mockPtr ));
+    manager.reset( new VaultManager(*confirmationsCalculator, utxoHasher, *mockPtr));
     BOOST_CHECK_EQUAL(manager->getTransaction(tx.GetHash()).mapValue.count("isVaultDeposit"),1u);
 }
 
@@ -966,4 +968,4 @@ BOOST_AUTO_TEST_CASE(willNotEraseManagedScriptToBackendOnRemovalMoreThanOnce)
     manager->removeManagedScript(managedScript);
 }
 
-BOOST_AUTO_TEST_SUITE_END()
+BOOST_AUTO_TEST_SUITE_END()

divi/src/wallet.cpp

@@ -263,7 +263,7 @@ void CWallet::activateVaultMode()
         const std::string keystring = vchDefaultKey.GetID().ToString();
         const std::string vaultID = std::string("vault_") + Hash160(keystring.begin(),keystring.end()).ToString().substr(0,10);
         vaultDB_.reset(new VaultManagerDatabase(vaultID,0));
-        vaultManager_.reset(new VaultManager(*confirmationNumberCalculator_,*vaultDB_));
+        vaultManager_.reset(new VaultManager(*confirmationNumberCalculator_, *utxoHasher, *vaultDB_));
         for(const std::string& whitelistedVaultScript: settings.GetMultiParameter("-whitelisted_vault"))
         {
             auto byteVector = ParseHex(whitelistedVaultScript);