Merge pull request #5 from evannetwork/feature/CORE-528-fix-missing-b…

…locks-from-infura fix missing blocks from infura in signer tx handling
evannetwork · Sep 25, 2019 · a5a4342 · a5a4342
2 parents fca9f2f + 8087548
commit a5a4342
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -4,6 +4,7 @@
 ### Features
 
 ### Fixes
+- fix missing blocks, that could not be retrieved after `newBlockHeaders` was triggered
 
 ### Deprecations
 

diff --git a/src/contracts/signer-internal.ts b/src/contracts/signer-internal.ts
@@ -64,16 +64,25 @@ export class SignerInternal extends Logger implements SignerInterface {
 
         // only load block details, when pending transactions are open
         if (pendingTransactionHashes.length !== 0) {
-          const blockDetails = await this.web3.eth.getBlock(blockHeader.number);
-
-          // iterate through all pending transactions and check if transaction was finished
-          Object.keys(this.pendingTransactions).forEach((transactionHash: string) => {
-            // if transaction was finished, call all the callbacks and delete the subscription
-            if (blockDetails.transactions.indexOf(transactionHash) !== -1) {
-              this.pendingTransactions[transactionHash].forEach(callback => callback(blockHeader));
-              delete this.pendingTransactions[transactionHash];
+          const blockNumber = blockHeader.number;
+          const blockStart = Date.now();
+          const checkInterval = setInterval(async () => {
+            this.log(`checking for block ${blockNumber}`, 'debug');
+            const blockDetails = await this.web3.eth.getBlock(blockHeader.number);
+            if (blockDetails) {
+              clearInterval(checkInterval);
+              this.log(`received block details for block ${blockNumber} after ${Date.now() - blockStart}ms`, 'debug');
+
+              // iterate through all pending transactions and check if transaction was finished
+              Object.keys(this.pendingTransactions).forEach((transactionHash: string) => {
+                // if transaction was finished, call all the callbacks and delete the subscription
+                if (blockDetails.transactions.indexOf(transactionHash) !== -1) {
+                  this.pendingTransactions[transactionHash].forEach(callback => callback(blockHeader));
+                  delete this.pendingTransactions[transactionHash];
+                }
+              });
             }
-          });
+          }, 500);
         }
       });
   }