watcher: remove obsolete watchers

Author: panoel

watcher/scripts/backfillArbitrum.ts

@@ -4,8 +4,7 @@ import axios from 'axios';
 import ora from 'ora';
 import { initDb } from '../src/databases/utils';
 import { AXIOS_CONFIG_JSON } from '../src/consts';
-import { ArbitrumWatcher } from '../src/watchers/ArbitrumWatcher';
-import { LOG_MESSAGE_PUBLISHED_TOPIC } from '../src/watchers/EVMWatcher';
+import { EVMWatcher, LOG_MESSAGE_PUBLISHED_TOPIC } from '../src/watchers/EVMWatcher';
 import { Chain, contracts } from '@wormhole-foundation/sdk-base';
 
 // This script exists because the Arbitrum RPC node only supports a 10 block range which is super slow
@@ -27,7 +26,7 @@ import { Chain, contracts } from '@wormhole-foundation/sdk-base';
   log.succeed(`Fetched ${blockNumbers.length} logs from Arbiscan`);
   // use the watcher to fetch corresponding blocks
   log = ora('Fetching blocks...').start();
-  const watcher = new ArbitrumWatcher('Mainnet');
+  const watcher = new EVMWatcher('Mainnet', 'Arbitrum', 'finalized', 'vaa');
   for (const blockNumber of blockNumbers) {
     log.text = `Fetching block ${blockNumber}`;
     const { vaasByBlock } = await watcher.getMessagesForBlocks(blockNumber, blockNumber);

watcher/src/watchers/ArbitrumWatcher.ts

@@ -14,9 +14,6 @@ import {
 import isNotNull from '../utils/isNotNull';
 
 export class FTEVMWatcher extends EVMWatcher {
-  finalizedBlockTag: BlockTag;
-  lastTimestamp: number;
-  latestFinalizedBlockNumber: number;
   rpc: string;
   provider: ethers.providers.JsonRpcProvider;
   tokenRouterContract: string;
@@ -30,9 +27,6 @@ export class FTEVMWatcher extends EVMWatcher {
     isTest = false
   ) {
     super(network, chain, finalizedBlockTag, 'ft');
-    this.lastTimestamp = 0;
-    this.latestFinalizedBlockNumber = 0;
-    this.finalizedBlockTag = finalizedBlockTag;
     this.provider = new ethers.providers.JsonRpcProvider(RPCS_BY_CHAIN[network][chain]);
     this.rpc = RPCS_BY_CHAIN[network][chain]!;
     this.evmTokenRouter = new EvmTokenRouter(

watcher/src/watchers/BSCWatcher.ts

@@ -28,17 +28,11 @@ import { BlockTag, EVMWatcher, LOG_MESSAGE_PUBLISHED_TOPIC, wormholeInterface }
 
 export class NTTWatcher extends EVMWatcher {
   chain: NTTChain;
-  finalizedBlockTag: BlockTag;
-  lastTimestamp: number;
-  latestFinalizedBlockNumber: number;
   pg: Knex;
 
   constructor(network: Network, chain: NTTEvmChain, finalizedBlockTag: BlockTag = 'latest') {
     super(network, chain, finalizedBlockTag, 'ntt');
     this.chain = chain;
-    this.lastTimestamp = 0;
-    this.latestFinalizedBlockNumber = 0;
-    this.finalizedBlockTag = finalizedBlockTag;
     this.pg = knex({
       client: 'pg',
       connection: {

watcher/src/watchers/FTEVMWatcher.ts

@@ -8,27 +8,5 @@ export class VAAWatcher extends EVMWatcher {
     finalizedBlockTag: BlockTag = 'latest'
   ) {
     super(network, chain, finalizedBlockTag, 'vaa');
-    // Special cases for batch size
-    if (chain === 'Acala' || chain === 'Karura' || chain === 'Berachain') {
-      this.maximumBatchSize = 50;
-    } else if (
-      chain === 'Blast' ||
-      chain === 'Klaytn' ||
-      chain === 'Scroll' ||
-      chain === 'Snaxchain' ||
-      chain === 'Unichain' ||
-      chain === 'Worldchain' ||
-      chain === 'Monad' ||
-      chain === 'Ink' ||
-      chain === 'HyperEVM' ||
-      chain === 'Seievm' ||
-      chain === 'Xlayer'
-    ) {
-      this.maximumBatchSize = 10;
-    }
-    // Special cases for watch loop delay
-    if (chain === 'Berachain') {
-      this.watchLoopDelay = 1000;
-    }
   }
 }

watcher/src/watchers/MoonbeamWatcher.ts

@@ -29,6 +29,28 @@ export class Watcher {
     // `ft` -> 'FT_'
     const loggerPrefix = mode.toUpperCase() + '_';
     this.logger = getLogger(loggerPrefix + chain);
+    // Special cases for batch size
+    if (chain === 'Acala' || chain === 'Karura' || chain === 'Berachain') {
+      this.maximumBatchSize = 50;
+    } else if (
+      chain === 'Blast' ||
+      chain === 'Klaytn' ||
+      chain === 'Scroll' ||
+      chain === 'Snaxchain' ||
+      chain === 'Unichain' ||
+      chain === 'Worldchain' ||
+      chain === 'Monad' ||
+      chain === 'Ink' ||
+      chain === 'HyperEVM' ||
+      chain === 'Seievm' ||
+      chain === 'Xlayer'
+    ) {
+      this.maximumBatchSize = 10;
+    }
+    // Special cases for watch loop delay
+    if (chain === 'Berachain') {
+      this.watchLoopDelay = 1000;
+    }
   }
 
   async getFinalizedBlockNumber(): Promise<number> {

watcher/src/watchers/NTTWatcher.ts

@@ -1,7 +1,4 @@
 export { AptosWatcher } from './AptosWatcher';
-export { BSCWatcher } from './BSCWatcher';
 export { CosmwasmWatcher } from './CosmwasmWatcher';
 export { EVMWatcher } from './EVMWatcher';
 export { InjectiveExplorerWatcher } from './InjectiveExplorerWatcher';
-export { MoonbeamWatcher } from './MoonbeamWatcher';
-export { PolygonWatcher } from './PolygonWatcher';