cppwallet ledger entry is built before the BDM reports ready

ArmoryQt.py

@@ -2313,6 +2313,7 @@ def loadWalletsAndSettings(self):
          LOGINFO(dispStr)
          # Register all wallets with TheBDM
          TheBDM.registerWallet( wlt.cppWallet )
+         TheBDM.bdm.registerWallet(wlt.cppWallet)
 
 
       # Get the last directory

cppForSwig/BlockUtils.cpp

@@ -2975,6 +2975,7 @@ void BlockDataManager_LevelDB::Reset(void)
    registeredOutPoints_.clear(); 
    allScannedUpToBlk_ = 0;
 
+
 }
 
 
@@ -3678,7 +3679,6 @@ BtcWallet* BlockDataManager_LevelDB::createNewWallet(void)
    return newWlt;
 }
 
-
 /////////////////////////////////////////////////////////////////////////////
 // This assumes that registeredTxList_ has already been populated from 
 // the initial blockchain scan.  The blockchain contains millions of tx,
@@ -3689,6 +3689,8 @@ void BlockDataManager_LevelDB::scanRegisteredTxForWallet( BtcWallet & wlt,
 {
    SCOPED_TIMER("scanRegisteredTxForWallet");
 
+	if(wlt.lastScanned_ > blkStart) blkStart = wlt.lastScanned_;
+
    // Make sure RegisteredTx objects have correct data, then sort.
    // TODO:  Why did I not need this with the MMAP blockchain?  Somehow
    //        I was able to sort correctly without this step, before...?
@@ -3745,6 +3747,11 @@ void BlockDataManager_LevelDB::scanRegisteredTxForWallet( BtcWallet & wlt,
    if(zcEnabled_)
       rescanWalletZeroConf(wlt);
 
+	uint32_t topBlk = getTopBlockHeight();
+	if(blkEnd > topBlk)
+		wlt.lastScanned_ = topBlk;
+	else if(blkEnd!=0)
+		wlt.lastScanned_ = blkEnd;
 }
 
 
@@ -4510,6 +4517,16 @@ void BlockDataManager_LevelDB::buildAndScanDatabases(
    // Since loading takes so long, there's a good chance that new block data
    // came in... let's get it.
    readBlkFileUpdate();
+
+   set<BtcWallet*>::iterator wltIter;
+   for(wltIter  = registeredWallets_.begin();
+       wltIter != registeredWallets_.end();
+       wltIter++)
+	{
+		BtcWallet* wlt = *wltIter;
+		scanRegisteredTxForWallet(*wlt, 0, lastTopBlock_);
+	}
+
    isInitialized_ = true;
    purgeZeroConfPool();
 

cppForSwig/BlockUtils.h

@@ -337,7 +337,7 @@ class ScrAddrObj
 class BtcWallet
 {
 public:
-   BtcWallet(void) : bdmPtr_(NULL) {}
+   BtcWallet(void) : bdmPtr_(NULL) {lastScanned_ = 0;}
    explicit BtcWallet(BlockDataManager_LevelDB* bdm) : bdmPtr_(bdm) {}
    ~BtcWallet(void);
 
@@ -443,6 +443,8 @@ class BtcWallet
 
    vector<LedgerEntry> & getEmptyLedger(void) { EmptyLedger_.clear(); return EmptyLedger_;}
 
+	uint32_t lastScanned_;
+
 private:
    vector<ScrAddrObj*>          scrAddrPtrs_;
    map<BinaryData, ScrAddrObj>  scrAddrMap_;
@@ -621,6 +623,7 @@ class BlockDataManager_LevelDB
    static BlockDataManager_LevelDB*   theOnlyBDM_;
    static bool                        bdmCreatedYet_;
    bool                               isInitialized_;
+	uint32_t									  lastScannedBlock_;
 
 
    // These will be set for the specific network we are testing