Merge pull request duality-solutions#364 from duality-solutions/v2.4.25-dmupdates

AmirAbrams · web-flow · commit ca70c30a0376 · 2019-07-31T22:16:38.000-05:00
Update keypool and rescan logic. Update GUI elements. WIP
diff --git a/src/qt/res/css/drk.css b/src/qt/res/css/drk.css
@@ -353,12 +353,12 @@ margin: 0px 18px 0px 18px;
 
 
 QScrollBar::handle:vertical { /* Scroll Bar Slider - vertical */
-background:#e0e0e0;
+background: #494848;
 min-height:10px;
 }
 
 QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */
-background:#e0e0e0;
+background: #494848;
 min-width:10px;
 }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1442,6 +1442,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex
                     }
                 }
             } else {
+                TopUpKeyPoolCombo(0, true);
                 for (const CTxOut& txout : tx.vout) {
                     CScript scriptPubKey = txout.scriptPubKey;
                     CTxDestination dest;
@@ -1456,7 +1457,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex
                     CPubKey retrievePubKey;
                     if (GetPubKey(keyID, retrievePubKey)) {
                         if (ReserveKeyForTransactions(retrievePubKey)) {
-                            TopUpKeyPoolCombo(0, true);
+                            SetAddressBook(dest, "", "");
                             fNeedToRescanTransactions = true;
                         }
                     }
@@ -4694,26 +4695,32 @@ bool CWallet::TopUpKeyPoolCombo(unsigned int kpSize, bool fIncreaseSize)
         if (IsLocked(true))
             return false;
 
+        int64_t amountExternal = setExternalKeyPool.size();
+        int64_t amountInternal = setInternalKeyPool.size();
+
         // Top up key pool
         unsigned int nTargetSize;
+        unsigned int defaultKeyPoolSize = std::max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t)0);
         if (kpSize > 0)
             nTargetSize = kpSize;
         else {
-            nTargetSize = std::max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), (int64_t)0);
+            if (defaultKeyPoolSize >= DynamicKeyPoolSize) {
+                DynamicKeyPoolSize = defaultKeyPoolSize;
+            }
+
+            if (fIncreaseSize) {
+                DynamicKeyPoolSize = DynamicKeyPoolSize + 1;
+            } //if fIncreaseSize
+
+            nTargetSize = DynamicKeyPoolSize; 
         }
 
         // count amount of available keys (internal, external)
         // make sure the keypool of external and internal keys fits the user selected target (-keypool)
-        int64_t amountExternal = setExternalKeyPool.size();
-        int64_t amountInternal = setInternalKeyPool.size();
+
         int64_t missingExternal = std::max(std::max((int64_t)nTargetSize, (int64_t)1) - amountExternal, (int64_t)0);
         int64_t missingInternal = std::max(std::max((int64_t)nTargetSize, (int64_t)1) - amountInternal, (int64_t)0);
 
-        if (fIncreaseSize) {
-            missingExternal = missingExternal + 2;
-            missingInternal = missingInternal + 2;
-        }
-
         if (!IsHDEnabled()) {
             // don't create extra internal keys
             missingInternal = 0;
@@ -4763,7 +4770,11 @@ bool CWallet::TopUpKeyPoolCombo(unsigned int kpSize, bool fIncreaseSize)
             }
 
             double dProgress = 100.f * nEnd / (nTargetSize + 1);
-            std::string strMsg = strprintf(_("Loading wallet... (%3.2f %%)"), dProgress);
+            std::string strMsg = "";
+            if (dProgress <= 100)
+                strMsg = strprintf(_("Loading wallet... (%3.2f %%)"), dProgress);
+            else
+                strMsg = strprintf(_("Increasing keypool... (%d)"),amountExternal);
             uiInterface.InitMessage(strMsg);
         }
     }
@@ -4904,7 +4915,9 @@ bool CWallet::ReserveKeyForTransactions(const CPubKey& pubKeyToReserve)
                 EraseIndex = true;
                 IndexToErase = nIndex;
                 ReserveKeyCount++;
-                SaveRescanIndex = true;
+                if (ReserveKeyCount <= DEFAULT_RESCAN_THRESHOLD) {
+                    SaveRescanIndex = true;
+                }
             }
             it++;
         }
@@ -5697,7 +5710,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile, const bool
         walletInstance->ScanForWalletTransactions(pindexRescan, true);
 
         //rescan if boolean is set. go back 100 transactions from most recent transaction involving me.
-        while ((walletInstance->fNeedToRescanTransactions) && (walletInstance->ReserveKeyCount > DEFAULT_RESCAN_THRESHOLD)) {
+        while ((walletInstance->fNeedToRescanTransactions) && (walletInstance->ReserveKeyCount > 0)) {
             //initialize values
             walletInstance->fNeedToRescanTransactions = false;
             walletInstance->ReserveKeyCount = 0;
@@ -5707,6 +5720,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile, const bool
                 computed_rescan_index = chainActive[computed_rescan_index->nHeight - 100];
             }
             walletInstance->ScanForWalletTransactions(computed_rescan_index, true);
+
         }
         
         LogPrintf(" rescan      %15dms\n", GetTimeMillis() - nStart);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -804,6 +804,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     std::set<int64_t> setInternalEdKeyPool;
     std::set<int64_t> setExternalEdKeyPool;
 
+    unsigned int DynamicKeyPoolSize = (int64_t)0;
+
     std::vector<std::vector<unsigned char>> reservedEd25519PubKeys;
 
     int64_t nTimeFirstKey;
@@ -835,6 +837,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     CBlockIndex* rescan_index = nullptr;
     int ReserveKeyCount = 0;
     bool SaveRescanIndex = false;
+    //unsigned int DynamicKeyPoolSize = (int64_t)0;
 
     bool WalletNeedsUpgrading()
     {

Original file line number	Diff line number	Diff line change
`@@ -353,12 +353,12 @@ margin: 0px 18px 0px 18px;`
`353`	`353`
`354`	`354`
`355`	`355`	`QScrollBar::handle:vertical { /* Scroll Bar Slider - vertical */`
`356`		`-background:#e0e0e0;`
	`356`	`+background: #494848;`
`357`	`357`	`min-height:10px;`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */`
`361`		`-background:#e0e0e0;`
	`361`	`+background: #494848;`
`362`	`362`	`min-width:10px;`
`363`	`363`	`}`
`364`	`364`