gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged

promag · promag · commit d3cfe0d6a472 · 2020-04-06T18:07:12.000+01:00
Github-Pull: #18160 Rebased-From: 0933a37
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
@@ -359,16 +359,17 @@ class WalletImpl : public Wallet
         }
         return result;
     }
-    bool tryGetBalances(WalletBalances& balances, int& num_blocks) override
+    bool tryGetBalances(WalletBalances& balances, int& num_blocks, bool force, int cached_num_blocks) override
     {
         auto locked_chain = m_wallet->chain().lock(true /* try_lock */);
         if (!locked_chain) return false;
+        num_blocks = locked_chain->getHeight().get_value_or(-1);
+        if (!force && num_blocks == cached_num_blocks) return false;
         TRY_LOCK(m_wallet->cs_wallet, locked_wallet);
         if (!locked_wallet) {
             return false;
         }
         balances = getBalances();
-        num_blocks = locked_chain->getHeight().get_value_or(-1);
         return true;
     }
     CAmount getBalance() override { return m_wallet->GetBalance().m_mine_trusted; }
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
@@ -198,8 +198,11 @@ class Wallet
     //! Get balances.
     virtual WalletBalances getBalances() = 0;
 
-    //! Get balances if possible without blocking.
-    virtual bool tryGetBalances(WalletBalances& balances, int& num_blocks) = 0;
+    //! Get balances if possible without waiting for chain and wallet locks.
+    virtual bool tryGetBalances(WalletBalances& balances,
+        int& num_blocks,
+        bool force,
+        int cached_num_blocks) = 0;
 
     //! Get balance.
     virtual CAmount getBalance() = 0;
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -77,21 +77,18 @@ void WalletModel::pollBalanceChanged()
     // rescan.
     interfaces::WalletBalances new_balances;
     int numBlocks = -1;
-    if (!m_wallet->tryGetBalances(new_balances, numBlocks)) {
+    if (!m_wallet->tryGetBalances(new_balances, numBlocks, fForceCheckBalanceChanged, cachedNumBlocks)) {
         return;
     }
 
-    if(fForceCheckBalanceChanged || numBlocks != cachedNumBlocks)
-    {
-        fForceCheckBalanceChanged = false;
+    fForceCheckBalanceChanged = false;
 
-        // Balance and number of transactions might have changed
-        cachedNumBlocks = numBlocks;
+    // Balance and number of transactions might have changed
+    cachedNumBlocks = numBlocks;
 
-        checkBalanceChanged(new_balances);
-        if(transactionTableModel)
-            transactionTableModel->updateConfirmations();
-    }
+    checkBalanceChanged(new_balances);
+    if(transactionTableModel)
+        transactionTableModel->updateConfirmations();
 }
 
 void WalletModel::checkBalanceChanged(const interfaces::WalletBalances& new_balances)

Original file line number	Diff line number	Diff line change
`@@ -359,16 +359,17 @@ class WalletImpl : public Wallet`
`359`	`359`	`}`
`360`	`360`	`return result;`
`361`	`361`	`}`
`362`		`- bool tryGetBalances(WalletBalances& balances, int& num_blocks) override`
	`362`	`+ bool tryGetBalances(WalletBalances& balances, int& num_blocks, bool force, int cached_num_blocks) override`
`363`	`363`	`{`
`364`	`364`	`auto locked_chain = m_wallet->chain().lock(true /* try_lock */);`
`365`	`365`	`if (!locked_chain) return false;`
	`366`	`+ num_blocks = locked_chain->getHeight().get_value_or(-1);`
	`367`	`+ if (!force && num_blocks == cached_num_blocks) return false;`
`366`	`368`	`TRY_LOCK(m_wallet->cs_wallet, locked_wallet);`
`367`	`369`	`if (!locked_wallet) {`
`368`	`370`	`return false;`
`369`	`371`	`}`
`370`	`372`	`balances = getBalances();`
`371`		`- num_blocks = locked_chain->getHeight().get_value_or(-1);`
`372`	`373`	`return true;`
`373`	`374`	`}`
`374`	`375`	`CAmount getBalance() override { return m_wallet->GetBalance().m_mine_trusted; }`