watcher: pick up the other testnet chains.

Author: panoel

watcher/src/consts.ts

@@ -80,6 +80,10 @@ export const RPCS_BY_CHAIN: { [key in Environment]: { [key in ChainName]?: strin
     base: process.env.BASE_RPC,
     sei: process.env.SEI_RPC,
     wormchain: process.env.WORMCHAIN_RPC,
+    arbitrum_sepolia: process.env.ARBITRUM_SEPOLIA_RPC,
+    base_sepolia: process.env.BASE_SEPOLIA_RPC,
+    optimism_sepolia: process.env.OPTIMISM_SEPOLIA_RPC,
+    holesky: process.env.HOLESKY_RPC,
     sepolia: process.env.SEPOLIA_RPC,
   },
   ['devnet']: {},

watcher/src/index.ts

@@ -18,7 +18,7 @@ const supportedChains: ChainName[] =
         // NOTE:  The commented out chains are left in there to easily
         //        identify which chains are not supported on testnet.
         'solana',
-        'ethereum',
+        // 'ethereum',
         // 'terra',
         'bsc',
         'polygon',
@@ -43,6 +43,10 @@ const supportedChains: ChainName[] =
         'sei',
         // 'wormchain',
         'sepolia',
+        'arbitrum_sepolia',
+        'base_sepolia',
+        'optimism_sepolia',
+        'holesky',
       ]
     : [
         // This is the list of chains supported in MAINNET.

watcher/src/watchers/ArbitrumWatcher.ts

@@ -11,7 +11,11 @@ export class ArbitrumWatcher extends EVMWatcher {
   lastEthTime: number;
 
   constructor(network: Environment) {
-    super(network, 'arbitrum');
+    if (network === 'mainnet') {
+      super(network, 'arbitrum');
+    } else {
+      super(network, 'arbitrum_sepolia');
+    }
 
     this.rpc = RPCS_BY_CHAIN[this.network][this.chain];
     if (!this.rpc) {

watcher/src/watchers/utils.ts

@@ -56,8 +56,19 @@ export function makeFinalizedWatcher(network: Environment, chainName: ChainName)
     return new SuiWatcher(network);
   } else if (chainName === 'wormchain') {
     return new WormchainWatcher(network);
-  } else if (chainName === 'sepolia' && network === 'testnet') {
-    return new EVMWatcher(network, chainName, 'finalized');
+  } else if (network === 'testnet') {
+    // These are testnet only chains
+    if (chainName === 'sepolia' || chainName === 'holesky') {
+      return new EVMWatcher(network, chainName, 'finalized');
+    } else if (chainName === 'arbitrum_sepolia') {
+      return new ArbitrumWatcher(network);
+    } else if (chainName === 'optimism_sepolia' || chainName === 'base_sepolia') {
+      return new EVMWatcher(network, chainName);
+    } else {
+      throw new Error(
+        `Attempted to create finalized watcher for unsupported testnet chain ${chainName}`
+      );
+    }
   } else {
     throw new Error(`Attempted to create finalized watcher for unsupported chain ${chainName}`);
   }