more consistent top block retrieval for UI Armory. Slight change to p…

…rogress bars when extending address pool
etotheipi · Mar 11, 2014 · 6db524b · 6db524b
1 parent a4ea625
commit 6db524b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/ArmoryQt.py b/ArmoryQt.py
@@ -650,6 +650,7 @@ def openMsgSigning():
 
       haveGUI[0] = True
       haveGUI[1] = self
+      BDMcurrentBlock[1] = 1
 
       self.checkWallets()
       reactor.callLater(0.1,  self.execIntroDialog)
@@ -4734,6 +4735,7 @@ def Heartbeat(self, nextBeatSec=1):
             self.checkSatoshiVersion()  # this actually only checks every hour
             newBlocks = TheBDM.readBlkFileUpdate(wait=True)
             self.currBlockNum = TheBDM.getTopBlockHeight()
+            if isinstance(self.currBlockNum, int): BDMcurrentBlock[0] = self.currBlockNum
 
             if not newBlocks:
                newBlocks = 0

diff --git a/armoryengine/BDM.py b/armoryengine/BDM.py
@@ -16,11 +16,14 @@
 from armoryengine.Timer import TimeThisFunction
 import CppBlockUtils as Cpp
 
+BDMcurrentBlock = [UINT32_MAX, 0]
+
 
 def getCurrTimeAndBlock():
    time0 = long(RightNowUTC())
    if TheBDM.getBDMState()=='BlockchainReady':
-      return (time0, TheBDM.getTopBlockHeight())
+      if BDMcurrentBlock[1]: return (time0, BDMcurrentBlock[0])
+      else: return (time0, TheBDM.getTopBlockHeight())
    else:
       return (time0, UINT32_MAX)
 

diff --git a/armoryengine/PyBtcWallet.py b/armoryengine/PyBtcWallet.py
@@ -948,10 +948,13 @@ def fillAddressPool(self, numPool=None, isActuallyNew=True, doRegister=True, GUI
       gap = self.lastComputedChainIndex - self.highestUsedChainIndex
       numToCreate = max(numPool - gap, 0)
 
-      from qtdialogs import DlgProgress
-      dlgprg = DlgProgress(self.mainWnd, self.mainWnd, HBar=numToCreate, Title='Computing New Addresses')
-      dlgprg.exec_(self.fillAddressPool_(numPool, isActuallyNew, doRegister, dlgprg, async=dlgprg.Kill))
-      return self.lastComputedChainIndex
+      if numToCreate > 1:
+         from qtdialogs import DlgProgress
+         dlgprg = DlgProgress(self.mainWnd, self.mainWnd, HBar=numToCreate, Title='Computing New Addresses')
+         dlgprg.exec_(self.fillAddressPool_(numPool, isActuallyNew, doRegister, dlgprg, async=dlgprg.Kill))
+         return self.lastComputedChainIndex
+      else:
+         return self.fillAddressPool_(numPool, isActuallyNew, doRegister)
 
    #############################################################################
    @AllowAsync