fix synchronizer cache data

iden3 · Jun 8, 2020 · 0d610b5 · 0d610b5
1 parent d3173d1
commit 0d610b5
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/rollup-operator/src/synch.js b/rollup-operator/src/synch.js
@@ -77,8 +77,10 @@ class Synchronizer {
         this.rollupPoSContract = new this.web3.eth.Contract(rollupPoSABI, this.rollupPoSAddress);
         abiDecoder.addABI(rollupPoSABI);
         this.forgeEventsCache = new Map();
+        this.retrySameBatch = 0;
+        this.cacheBatchToUpdate = 0;
         this.mode = mode;
-        
+
         this._initTimeouts(timeouts);
         this._initLogger(logLevel);
     }
@@ -272,6 +274,7 @@ class Synchronizer {
                     const updateFlag = await this._updateEvents([...logsForge,...logsOnChain], lastBatchSaved + 1, targetBlockNumber);
                     if (!updateFlag) continue;
                     lastBatchSaved = await this.getLastBatch();
+                    this.cacheBatchToUpdate = lastBatchSaved;
                 }
 
                 totalSynch = (currentBatchDepth == 0) ? 100 : ((lastBatchSaved / currentBatchDepth) * 100);
@@ -343,6 +346,14 @@ class Synchronizer {
         if (lastSynchBlock >= currentBlock - confirmationBlocks)
             this.forgeEventsCache.clear();
 
+        if (this.cacheBatchToUpdate == batchToSynch)
+            this.retrySameBatch += 1;
+
+        if (this.retrySameBatch > 4){
+            this.forgeEventsCache.clear();
+            this.retrySameBatch = 0;
+        }
+
         let targetBlockNumber = this.forgeEventsCache.get(batchToSynch);
         if (!targetBlockNumber){
             const logsForge = await this.rollupContract.getPastEvents("ForgeBatch", {