watcher: get finalizedBlock after sleeping

wormhole-foundation · Nov 21, 2024 · 1420b01 · 1420b01
1 parent 156da32
commit 1420b01
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/watcher/src/watchers/NearArchiveWatcher.ts b/watcher/src/watchers/NearArchiveWatcher.ts
@@ -125,6 +125,10 @@ export class NearArchiveWatcher extends Watcher {
       blocks,
       quittingTimestamp
     );
+    // This is the case where there are no transactions in the time window.
+    if (response.lastBlockHeight === 0) {
+      response.lastBlockHeight = toBlock;
+    }
     const lastBlockInfo = await fetchBlockByBlockId(provider, response.lastBlockHeight);
     // Make a block for the to_block, if it isn't already there
     const blockKey = makeBlockKey(

diff --git a/watcher/src/watchers/Watcher.ts b/watcher/src/watchers/Watcher.ts
@@ -138,6 +138,14 @@ export class Watcher {
           }
           await sleep(HB_INTERVAL / 2);
         }
+        // After sleeping for 1 hour, need to get the latest finalized block
+        try {
+          toBlock = await this.getFinalizedBlockNumber();
+          this.logger.debug(`finalized block after 1 hour = ${toBlock}`);
+        } catch (e) {
+          this.logger.error(`error fetching finalized block after 1 hour: ${e}`);
+          // If this throws, the loop will continue and try again.
+        }
       }
       firstTime = false;
     }