Merge pull request #425 from kleros/fix/validator-arbToGnosis

Fix/validator arb to gnosis

Author: mani99brar

validator-cli/src/consts/bridgeRoutes.ts

@@ -66,7 +66,7 @@ const arbToGnosisConfigs: { [key in Network]: RouteConfigs } = {
   },
 };
 
-const bridges: { [chainId: number]: Bridge } = {
+export const bridges: { [chainId: number]: Bridge } = {
   11155111: {
     chain: "sepolia",
     minChallengePeriod: 10800,

validator-cli/src/utils/botConfig.ts

@@ -1,5 +1,5 @@
-import { InvalidBotPathError, InvalidNetworkError } from "./errors";
-import { Network } from "../consts/bridgeRoutes";
+import { InvalidBotPathError, InvalidNetworkError, InvalidChainIdError } from "./errors";
+import { Network, bridges } from "../consts/bridgeRoutes";
 require("dotenv").config();
 
 export enum BotPaths {
@@ -52,6 +52,7 @@ export interface NetworkConfig {
  */
 export function getNetworkConfig(): NetworkConfig[] {
   const chainIds = process.env.VEAOUTBOX_CHAINS ? process.env.VEAOUTBOX_CHAINS.split(",") : [];
+  validateChainId(chainIds);
   const rawNetwork = process.env.NETWORKS ? process.env.NETWORKS.split(",") : [];
   const networks = validateNetworks(rawNetwork);
 
@@ -74,3 +75,11 @@ function validateNetworks(networks: string[]): Network[] {
   }
   return networks as unknown as Network[];
 }
+
+function validateChainId(chainIds: string[]): void {
+  for (const chainId of chainIds) {
+    if (!bridges[chainId]) {
+      throw new InvalidChainIdError(chainId);
+    }
+  }
+}

validator-cli/src/utils/epochHandler.ts

@@ -64,7 +64,7 @@ const getLatestChallengeableEpoch = (epochPeriod: number, now: number = Date.now
  */
 const getBlockFromEpoch = async (epoch: number, epochPeriod: number, provider: JsonRpcProvider): Promise<number> => {
   const epochTimestamp = epoch * epochPeriod;
-  const latestBlock = await provider.getBlock("final");
+  const latestBlock = await provider.getBlock("finalized");
   const baseBlock = await provider.getBlock(latestBlock.number - 500);
   const secPerBlock = (latestBlock.timestamp - baseBlock.timestamp) / (latestBlock.number - baseBlock.number);
   const blockFallBack = Math.floor((latestBlock.timestamp - epochTimestamp) / secPerBlock);

validator-cli/src/utils/errors.ts

@@ -32,6 +32,15 @@ class InvalidBotPathError extends Error {
   }
 }
 
+class InvalidChainIdError extends Error {
+  constructor(chainId: string) {
+    super();
+    this.name = "InvalidChainIdError";
+    const allowed = Object.keys(require("../consts/bridgeRoutes").bridges).join(", ");
+    this.message = `Invalid chainId: ${chainId}, use from: ${allowed}`;
+  }
+}
+
 class DevnetOwnerNotSetError extends Error {
   constructor() {
     super();
@@ -64,4 +73,5 @@ export {
   DevnetOwnerNotSetError,
   InvalidNetworkError,
   MissingEnvError,
+  InvalidChainIdError,
 };

validator-cli/src/utils/graphQueries.ts

@@ -154,7 +154,7 @@ const getSnapshotSentForEpoch = async (
   epoch: number,
   veaInbox: string,
   chainId: number
-): Promise<{ txHash: string }> => {
+): Promise<{ txHash: string } | undefined> => {
   try {
     const subgraph = getInboxSubgraphUrl(chainId);
 

validator-cli/src/utils/transactionHandlers/arbToGnosisHandler.ts

@@ -33,7 +33,7 @@ export class ArbToGnosisTransactionHandler extends BaseTransactionHandler<VeaInb
     const currentAllowance: bigint = await weth.allowance(signer.address, veaOutbox.address);
     if (currentAllowance < deposit) {
       const approvalAmount = deposit * BigInt(10); // Approving for 10 claims
-      const approveTx = await weth.approve(routeConfig[Network.TESTNET].veaOutbox.address, deposit * approvalAmount);
+      const approveTx = await weth.approve(veaOutbox.address, approvalAmount);
       await approveTx.wait();
     }
   }

validator-cli/src/watcher.ts

@@ -14,7 +14,7 @@ import { ChallengeAndResolveClaimParams, challengeAndResolveClaim } from "./help
 import { saveSnapshot, SaveSnapshotParams } from "./helpers/snapshot";
 import { getTransactionHandler } from "./utils/transactionHandlers";
 
-const RPC_BLOCK_LIMIT = 500; // RPC_BLOCK_LIMIT is the limit of blocks that can be queried at once
+const RPC_BLOCK_LIMIT = 1000; // RPC_BLOCK_LIMIT is the limit of blocks that can be queried at once
 
 /**
  * @file This file contains the logic for watching bridge and validating/resolving for claims.
@@ -35,7 +35,7 @@ export const watch = async (
   const { path, toSaveSnapshot } = getBotPath({ cliCommand });
   const networkConfigs = getNetworkConfig();
   emitter.emit(BotEvents.STARTED, path, networkConfigs[0].networks);
-  const transactionHandlers: { [epoch: number]: any } = {};
+  const transactionHandlers: { [key: string]: any } = {};
   const toWatch: { [key: string]: { count: number; epochs: number[] } } = {};
   while (!shutDownSignal.getIsShutdownSignal()) {
     for (const networkConfig of networkConfigs) {
@@ -49,7 +49,7 @@ async function processNetwork(
   path: number,
   toSaveSnapshot: boolean,
   networkConfig: NetworkConfig,
-  transactionHandlers: { [epoch: number]: any },
+  transactionHandlers: { [key: string]: any },
   toWatch: { [key: string]: { count: number; epochs: number[] } },
   emitter: typeof defaultEmitter
 ): Promise<void> {
@@ -112,7 +112,7 @@ interface ProcessEpochParams {
   outboxRPC: string;
   routerRPC: string | undefined;
   toWatch: { [key: string]: { count: number; epochs: number[] } };
-  transactionHandlers: { [epoch: number]: any };
+  transactionHandlers: { [key: string]: any };
   emitter: typeof defaultEmitter;
 }
 async function processEpochsForNetwork({
@@ -141,6 +141,7 @@ async function processEpochsForNetwork({
   // Checks and saves the snapshot if needed
   if (toSaveSnapshot) {
     const TransactionHandler = getTransactionHandler(chainId, network) as any;
+    const txnHandlerKey = `${routeConfig[network].veaInbox.address}_${currentEpoch}`;
     const transactionHandler =
       transactionHandlers[currentEpoch] ||
       new TransactionHandler({
@@ -163,7 +164,7 @@ async function processEpochsForNetwork({
     } as SaveSnapshotParams);
     const count = toWatch[networkKey].count;
     if (count == -1 || count != latestCount) {
-      transactionHandlers[currentEpoch] = updatedTransactionHandler;
+      transactionHandlers[txnHandlerKey] = updatedTransactionHandler;
       toWatch[networkKey].count = latestCount;
     }
   }
@@ -176,7 +177,6 @@ async function processEpochsForNetwork({
     if (latestBlock.number - epochBlock > RPC_BLOCK_LIMIT) {
       toBlock = epochBlock + RPC_BLOCK_LIMIT;
     }
-
     const claim = await getClaim({ chainId, veaOutbox, veaOutboxProvider, epoch, fromBlock: epochBlock, toBlock });
 
     let updatedTransactions;