fix: relayer & validator

relayer-cli/.env.dist

@@ -1,8 +1,14 @@
 PRIVATE_KEY=
 
+# Devnet Sender Address
+DEVNET_SENDER=0x906dE43dBef27639b1688Ac46532a16dc07Ce410
+
 RPC_CHIADO=https://rpc.chiadochain.net
 RPC_SEPOLIA=
 
+VEAOUTBOX_CHAIN_ID=1115111
+
+
 VEAINBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS=0x906dE43dBef27639b1688Ac46532a16dc07Ce410
 VEAINBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS=0xAb53e341121448Ae259Da8fa17f216Cb0e21199C
 VEAOUTBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS=0x906dE43dBef27639b1688Ac46532a16dc07Ce410

relayer-cli/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "start-devnet-relayer": "npx ts-node ./src/devnetRelayExample.ts",
-    "start-testnet-sepolia": "npx ts-node ./src/testnet/arbSepToSepRelayer.ts"
+    "start-testnet-relayer": "npx ts-node ./src/testnetRelayer.ts"
   },
   "dependencies": {
     "@kleros/vea-contracts": "workspace:^",

relayer-cli/src/consts/bridgeRoutes.ts

@@ -1,45 +1,61 @@
 // File for handling contants and configurations
 require("dotenv").config();
+import veaOutboxArbToEthContract from "@kleros/vea-contracts/deployments/sepolia/VeaOutboxArbToEthTestnet.json";
+import veaOutboxArbToGnosisContract from "@kleros/vea-contracts/deployments/chiado/VeaOutboxArbToGnosisTestnet.json";
 
 interface IBridge {
   chainId: number;
-  veaInbox: string;
-  veaOutbox: string;
+  chain: string;
+  epochPeriod: number;
+  veaInboxAddress: string;
+  veaOutboxAddress: string;
   batcher: string;
   rpcOutbox: string;
+  veaOutboxContract: any;
 }
 
 // Using destination chainId to get the route configuration.
 const bridges: { [chainId: number]: IBridge } = {
   11155111: {
     chainId: 11155111,
-    veaInbox: process.env.VEAINBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS,
-    veaOutbox: process.env.VEAOUTBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS,
+    chain: "sepolia",
+    epochPeriod: 7200,
+    veaInboxAddress: process.env.VEAINBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS,
+    veaOutboxAddress: process.env.VEAOUTBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS,
     batcher: process.env.TRANSACTION_BATCHER_CONTRACT_ADDRESS_SEPOLIA,
     rpcOutbox: process.env.RPC_SEPOLIA,
+    veaOutboxContract: veaOutboxArbToEthContract,
   },
   10200: {
     chainId: 10200,
-    veaInbox: process.env.VEAINBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS,
-    veaOutbox: process.env.VEAOUTBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS,
+    chain: "chiado",
+    epochPeriod: 3600,
+    veaInboxAddress: process.env.VEAINBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS,
+    veaOutboxAddress: process.env.VEAOUTBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS,
     batcher: process.env.TRANSACTION_BATCHER_CONTRACT_ADDRESS_CHIADO,
     rpcOutbox: process.env.RPC_CHIADO,
+    veaOutboxContract: veaOutboxArbToGnosisContract,
   },
 };
 
+// Getters
 const getBridgeConfig = (chainId: number): IBridge | undefined => {
   return bridges[chainId];
 };
 
+const getEpochPeriod = (chainId: number): number => {
+  return bridges[chainId].epochPeriod;
+};
+
 const getInboxSubgraph = (chainId: number): string => {
   switch (chainId) {
     case 11155111:
       return process.env.VEAINBOX_ARBSEPOLIA_TO_SEPOLIA_SUBGRAPH;
     case 10200:
       return process.env.VEAINBOX_ARBSEPOLIA_TO_CHIADO_SUBGRAPH;
     default:
-      throw new Error("Invalid chainid");
+      throw new Error("Invalid chainId");
   }
 };
 
-export { getBridgeConfig, getInboxSubgraph };
+export { getBridgeConfig, getInboxSubgraph, getEpochPeriod };

relayer-cli/src/devnetRelayExample.ts

@@ -1,42 +1,26 @@
 import { relayAllFrom } from "./utils/relay";
-import * as fs from "fs";
-import { initialize, updateStateFile } from "./utils/relayerHelpers";
+import { initialize, ShutdownManager, updateStateFile, setupExitHandlers, delay } from "./utils/relayerHelpers";
 
-// let chain_ids = [5, 10200];
-let chain_ids = [11155111];
-const epochPeriod = 1800; // 30 min
-const _contract = require("@kleros/vea-contracts/deployments/sepolia/VeaOutboxArbToEthDevnet.json");
-const network = "devnet";
+export async function start(shutdownManager: ShutdownManager = new ShutdownManager()) {
+  const chainId = parseInt(process.env.VEAOUTBOX_CHAIN_ID);
+  const epochPeriod = 1800; // 30 min
+  const network = "devnet";
+  await setupExitHandlers(chainId, shutdownManager);
+  while (!shutdownManager.getIsShuttingDown()) {
+    let nonce = await initialize(chainId, network);
+    // This is libghtbulb switch address in arbitrum sepolia
+    const sender = process.env.DEVNET_SENDER;
+    nonce = await relayAllFrom(chainId, nonce, sender);
+    if (nonce != null) await updateStateFile(chainId, Math.floor(Date.now() / 1000), nonce, network);
 
-["SIGINT", "SIGTERM", "SIGQUIT", "EXIT", "MODULE_NOT_FOUND"].forEach((signal) =>
-  process.on(signal, async () => {
-    console.log("exit");
-    for (const chain_id of chain_ids) {
-      const lock_file_name = "./src/state/" + chain_id + ".pid";
-      if (fs.existsSync(lock_file_name)) {
-        fs.unlinkSync(lock_file_name);
-      }
-    }
-    process.exit(0);
-  })
-);
-
-(async () => {
-  while (1) {
-    for (const chain_id of chain_ids) {
-      let nonce = await initialize(chain_id, network);
-      // This is libghtbulb switch address in arbitrum sepolia
-      const sender = "0x28d6D503F4c5734cD926E96b63C61527d975B382";
-      nonce = await relayAllFrom(chain_id, nonce, sender, _contract);
-      if (nonce != null) await updateStateFile(chain_id, Math.floor(Date.now() / 1000), nonce, network);
-    }
     const currentTS = Math.floor(Date.now() / 1000);
     const delayAmount = (epochPeriod - (currentTS % epochPeriod)) * 1000 + 100 * 1000;
     console.log("waiting for the next epoch. . .", Math.floor(delayAmount / 1000), "seconds");
     await delay(delayAmount);
   }
-})();
+}
 
-function delay(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+if (require.main === module) {
+  const shutdownManager = new ShutdownManager(false);
+  start(shutdownManager);
 }

relayer-cli/src/testnetRelayer.ts

@@ -0,0 +1,28 @@
+require("dotenv").config();
+import { relayBatch } from "utils/relay";
+import { initialize, updateStateFile, delay, setupExitHandlers, ShutdownManager } from "utils/relayerHelpers";
+import { getEpochPeriod } from "consts/bridgeRoutes";
+
+export async function start(shutdownManager: ShutdownManager = new ShutdownManager()) {
+  const network = "testnet";
+  const chainId = parseInt(process.env.VEAOUTBOX_CHAIN_ID);
+  const epochPeriod = getEpochPeriod(chainId);
+  const batchSize = 10; // 10 messages per batch
+
+  await setupExitHandlers(chainId, shutdownManager);
+
+  while (!shutdownManager.getIsShuttingDown()) {
+    let nonce = await initialize(chainId, network);
+    nonce = await relayBatch(chainId, nonce, batchSize);
+    if (nonce != null) await updateStateFile(chainId, Math.floor(Date.now() / 1000), nonce, network);
+    const currentTS = Math.floor(Date.now() / 1000);
+    const delayAmount = (epochPeriod - (currentTS % epochPeriod)) * 1000 + 100 * 1000;
+    console.log("waiting for the next epoch. . .", Math.floor(delayAmount / 1000), "seconds");
+    await delay(delayAmount);
+  }
+}
+
+if (require.main === module) {
+  const shutdownManager = new ShutdownManager(false);
+  start(shutdownManager);
+}

relayer-cli/src/utils/ethers.ts

@@ -7,6 +7,7 @@ import {
   VeaInboxArbToGnosis__factory,
   VeaOutboxArbToGnosis__factory,
 } from "@kleros/vea-contracts/typechain-types";
+import { getBridgeConfig } from "consts/bridgeRoutes";
 
 function getWallet(privateKey: string, web3ProviderURL: string) {
   return new Wallet(privateKey, new JsonRpcProvider(web3ProviderURL));
@@ -18,40 +19,58 @@ function getWalletRPC(privateKey: string, rpc: JsonRpcProvider) {
 
 // Using destination chainId as identifier, Ex: Arbitrum One (42161) -> Ethereum Mainnet (1): Use "1" as chainId
 function getVeaInbox(veaInboxAddress: string, privateKey: string, web3ProviderURL: string, chainId: number) {
-  if (chainId == 11155111) {
-    return VeaInboxArbToEth__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
-  } else if (chainId == 10200) {
-    return VeaInboxArbToGnosis__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
-  } else {
-    throw new Error(`Unsupported chainId: ${chainId}`);
+  const bridge = getBridgeConfig(chainId);
+  switch (bridge.chain) {
+    case "sepolia":
+    case "mainnet":
+      return VeaInboxArbToEth__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
+    case "chiado":
+    case "gnosis":
+      return VeaInboxArbToGnosis__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
+    default:
+      throw new Error(`Unsupported chainId: ${chainId}`);
   }
 }
 
 function getVeaInboxProvider(veaInboxAddress: string, privateKey: string, rpc: JsonRpcProvider, chainId: number) {
-  if (chainId == 11155111) {
-    return VeaInboxArbToEth__factory.connect(veaInboxAddress, getWalletRPC(privateKey, rpc));
-  } else if (chainId == 10200) {
-    return VeaInboxArbToGnosis__factory.connect(veaInboxAddress, getWalletRPC(privateKey, rpc));
+  const bridges = getBridgeConfig(chainId);
+  switch (bridges.chain) {
+    case "sepolia":
+    case "mainnet":
+      return VeaInboxArbToEth__factory.connect(veaInboxAddress, getWalletRPC(privateKey, rpc));
+    case "chiado":
+    case "gnosis":
+      return VeaInboxArbToGnosis__factory.connect(veaInboxAddress, getWalletRPC(privateKey, rpc));
+    default:
+      throw new Error(`Unsupported chainId: ${chainId}`);
   }
 }
 
 function getVeaOutbox(veaInboxAddress: string, privateKey: string, web3ProviderURL: string, chainId: number) {
-  if (chainId == 11155111) {
-    return VeaOutboxArbToEth__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
-  } else if (chainId == 10200) {
-    return VeaOutboxArbToGnosis__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
-  } else {
-    throw new Error(`Unsupported chainId: ${chainId}`);
+  const bridges = getBridgeConfig(chainId);
+  switch (bridges.chain) {
+    case "sepolia":
+    case "mainnet":
+      return VeaOutboxArbToEth__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
+    case "chiado":
+    case "gnosis":
+      return VeaOutboxArbToGnosis__factory.connect(veaInboxAddress, getWallet(privateKey, web3ProviderURL));
+    default:
+      throw new Error(`Unsupported chainId: ${chainId}`);
   }
 }
 
 function getVeaOutboxProvider(veaOutboxAddress: string, privateKey: string, rpc: JsonRpcProvider, chainId: number) {
-  if (chainId == 11155111) {
-    return VeaOutboxArbToEth__factory.connect(veaOutboxAddress, getWalletRPC(privateKey, rpc));
-  } else if (chainId == 10200) {
-    return VeaOutboxArbToGnosis__factory.connect(veaOutboxAddress, getWalletRPC(privateKey, rpc));
-  } else {
-    throw new Error(`Unsupported chainId: ${chainId}`);
+  const bridges = getBridgeConfig(chainId);
+  switch (bridges.chain) {
+    case "sepolia":
+    case "mainnet":
+      return VeaOutboxArbToEth__factory.connect(veaOutboxAddress, getWalletRPC(privateKey, rpc));
+    case "chiado":
+    case "gnosis":
+      return VeaOutboxArbToGnosis__factory.connect(veaOutboxAddress, getWalletRPC(privateKey, rpc));
+    default:
+      throw new Error(`Unsupported chainId: ${chainId}`);
   }
 }