watcher: storing latest block

Author: panoel

watcher/src/databases/Database.ts

@@ -20,4 +20,7 @@ export class Database {
   async storeVaasByBlock(chain: ChainName, vaasByBlock: VaasByBlock): Promise<void> {
     throw new Error('Not Implemented');
   }
+  async storeLatestBlock(chain: ChainName, lastBlockKey: string, isNTT: boolean): Promise<void> {
+    throw new Error('Not Implemented');
+  }
 }

watcher/src/databases/utils.ts

@@ -75,6 +75,14 @@ export const initDb = (startWatching: boolean = true): Database => {
   return database;
 };
 
+export const storeLatestBlock = async (
+  chain: ChainName,
+  lastBlockKey: string,
+  isNTT: boolean
+): Promise<void> => {
+  return database.storeLatestBlock(chain, lastBlockKey, isNTT);
+};
+
 export const getResumeBlockByChain = async (
   network: Environment,
   chain: ChainName,

watcher/src/index.ts

@@ -84,8 +84,9 @@ for (const chain of supportedChains) {
 const supportedNTTChains: ChainName[] =
   network === 'testnet'
     ? [
+        //'solana',
         'sepolia',
-        //'arbitrum_sepolia'
+        'arbitrum_sepolia',
       ]
     : [];
 

watcher/src/watchers/NTTWatcher.ts

@@ -221,8 +221,7 @@ export class NTTWatcher extends Watcher {
     return block.number;
   }
 
-  // TODO: Not sure we want to return VaasByBlock here
-  async getNttMessagesForBlocks(fromBlock: number, toBlock: number) {
+  async getNttMessagesForBlocks(fromBlock: number, toBlock: number): Promise<string> {
     const nttAddress = NTT_CONTRACT[this.network][this.chain];
     if (!nttAddress) {
       throw new Error(`NTT manager contract not defined for ${this.network}`);
@@ -427,6 +426,9 @@ export class NTTWatcher extends Watcher {
       dumpLifecycleMap(this.lifecycleMap);
       await sleep(3000);
     }
+    // Create blockKey
+    const blockKey = makeBlockKey(toBlock.toString(), timestampsByBlock[toBlock]);
+    return blockKey;
   }
 }
 

watcher/src/watchers/Watcher.ts

@@ -7,7 +7,7 @@ import {
 import { z } from 'zod';
 import { TIMEOUT } from '../consts';
 import { VaasByBlock } from '../databases/types';
-import { getResumeBlockByChain, storeVaasByBlock } from '../databases/utils';
+import { getResumeBlockByChain, storeLatestBlock, storeVaasByBlock } from '../databases/utils';
 import { getLogger, WormholeLogger } from '../utils/logger';
 
 export class Watcher {
@@ -31,7 +31,7 @@ export class Watcher {
     throw new Error('Not Implemented');
   }
 
-  async getNttMessagesForBlocks(fromBlock: number, toBlock: number) {
+  async getNttMessagesForBlocks(fromBlock: number, toBlock: number): Promise<string> {
     throw new Error('Not Implemented');
   }
 
@@ -71,7 +71,8 @@ export class Watcher {
           toBlock = Math.min(fromBlock + this.maximumBatchSize - 1, toBlock);
           this.logger.info(`fetching messages from ${fromBlock} to ${toBlock}`);
           if (this.isNTT) {
-            await this.getNttMessagesForBlocks(fromBlock, toBlock);
+            const blockKey = await this.getNttMessagesForBlocks(fromBlock, toBlock);
+            await storeLatestBlock(this.chain, blockKey, true);
           } else {
             const vaasByBlock = await this.getMessagesForBlocks(fromBlock, toBlock);
             await storeVaasByBlock(this.chain, vaasByBlock);