fix(core-blockchain): always attempt to download blocks after start (#…

…2746)
ArkEcosystem · Jun 25, 2019 · 2633741 · 2633741
1 parent 66ecd74
commit 2633741
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/core-blockchain/src/blockchain.ts b/packages/core-blockchain/src/blockchain.ts
@@ -498,7 +498,7 @@ export class Blockchain implements blockchain.IBlockchain {
      * Get the last downloaded block of the blockchain.
      */
     public getLastDownloadedBlock(): Interfaces.IBlockData {
-        return this.state.lastDownloadedBlock;
+        return this.state.lastDownloadedBlock || this.getLastBlock().data;
     }
 
     /**

diff --git a/packages/core-blockchain/src/state-machine.ts b/packages/core-blockchain/src/state-machine.ts
@@ -75,7 +75,7 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
             }
         }
 
-        if (blockchain.isSynced(stateStorage.lastDownloadedBlock)) {
+        if (stateStorage.lastDownloadedBlock && blockchain.isSynced(stateStorage.lastDownloadedBlock)) {
             stateStorage.noBlockCounter = 0;
             stateStorage.p2pUpdateCounter = 0;
 
@@ -152,7 +152,6 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
              *  state machine data init      *
              ******************************* */
             stateStorage.setLastBlock(block);
-            stateStorage.lastDownloadedBlock = block.data;
 
             // Delete all rounds from the future due to shutdown before processBlocks finished writing the blocks.
             const roundInfo = roundCalculator.calculateRound(block.data.height);
@@ -208,7 +207,7 @@ blockchainMachine.actionMap = (blockchain: Blockchain) => ({
         }
 
         // Could have changed since entering this function, e.g. due to a rollback.
-        if (lastDownloadedBlock.id !== stateStorage.lastDownloadedBlock.id) {
+        if (stateStorage.lastDownloadedBlock && lastDownloadedBlock.id !== stateStorage.lastDownloadedBlock.id) {
             return;
         }