Merge pull request #359 from kleros/feat/arbSep-chaido-deploy

kleros · Dec 3, 2024 · 3eebb3f · 3eebb3f
2 parents b00c1ed + acb800c
commit 3eebb3f
Show file tree

Hide file tree

Showing 13 changed files with 1,629 additions and 739 deletions.
diff --git a/contracts/deploy/01-outbox/01-arb-to-gnosis-outbox.ts b/contracts/deploy/01-outbox/01-arb-to-gnosis-outbox.ts
@@ -26,7 +26,7 @@ const paramsByChainId = {
   GNOSIS_CHIADO: {
     deposit: parseEther("0.2"), // ~20 WETH budget to start, enough for 8 days of challenges
     // bridging speed is 29 - 31 hours.
-    epochPeriod: 7200, // 2 hours
+    epochPeriod: 3600, // 1 hours
     minChallengePeriod: 10800, // 3 hours
     numEpochTimeout: 1000000, // never
     maxMissingBlocks: 1000000, // any

diff --git a/contracts/deploy/02-inbox/02-arb-to-gnosis-inbox.ts b/contracts/deploy/02-inbox/02-arb-to-gnosis-inbox.ts
@@ -2,6 +2,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
 import getContractAddress from "../../deploy-helpers/getContractAddress";
 import { ethers } from "hardhat";
+import { providers } from "ethers";
 
 enum SenderChains {
   ARBITRUM = 42161,
@@ -39,6 +40,12 @@ const deployInbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
   const { epochPeriod } = paramsByChainId[SenderChains[chainId]];
 
+  const routerNetworks = {
+    ARBITRUM: config.networks.mainnet,
+    ARBITRUM_SEPOLIA: config.networks.sepolia,
+    HARDHAT: config.networks.localhost,
+  };
+
   // Hack to predict the deployment address on the sender chain.
   // TODO: use deterministic deployments
 
@@ -76,7 +83,20 @@ const deployInbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   };
 
   // ----------------------------------------------------------------------------------------------
-  const liveDeployer = async () => {};
+  const liveDeployer = async () => {
+    const routerChainProvider = new providers.JsonRpcProvider(routerNetworks[SenderChains[chainId]].url);
+    let nonceRouter = await routerChainProvider.getTransactionCount(deployer);
+
+    const routerAddress = getContractAddress(deployer, nonceRouter);
+    console.log("calculated future router for nonce %d: %s", nonceRouter, routerAddress);
+
+    await deploy("VeaInboxArbToGnosis" + (chainId === 42161 ? "" : "Testnet"), {
+      contract: "VeaInboxArbToGnosis",
+      from: deployer,
+      args: [epochPeriod, routerAddress],
+      log: true,
+    });
+  };
 
   // ----------------------------------------------------------------------------------------------
   if (chainId === 31337) {
@@ -93,5 +113,4 @@ deployInbox.skip = async ({ getChainId }) => {
   return !SenderChains[chainId];
 };
 deployInbox.runAtTheEnd = true;
-
 export default deployInbox;
diff --git a/contracts/deployments/arbitrumSepolia/VeaInboxArbToGnosisTestnet.json b/contracts/deployments/arbitrumSepolia/VeaInboxArbToGnosisTestnet.json
diff --git a/contracts/deployments/chiado/VeaInboxGnosisToArbTestnet.json b/contracts/deployments/chiado/VeaInboxGnosisToArbTestnet.json
diff --git a/contracts/deployments/chiado/VeaOutboxArbToGnosisTestnet.json b/contracts/deployments/chiado/VeaOutboxArbToGnosisTestnet.json
diff --git a/contracts/deployments/sepolia/RouterArbToGnosisTestnet.json b/contracts/deployments/sepolia/RouterArbToGnosisTestnet.json
diff --git a/contracts/src/canonical/gnosis-chain/IAMB.sol b/contracts/src/canonical/gnosis-chain/IAMB.sol
@@ -12,4 +12,11 @@ interface IAMB {
     function messageSender() external view returns (address);
 
     function messageSourceChainId() external view returns (bytes32);
+
+    event AffirmationCompleted(
+        address indexed sender,
+        address indexed executor,
+        bytes32 indexed messageId,
+        bool status
+    );
 }
diff --git a/relayer-cli/package.json b/relayer-cli/package.json
@@ -21,5 +21,8 @@
     "typescript": "^4.9.5",
     "web3": "^1.10.4",
     "web3-batched-send": "^1.0.3"
+  },
+  "devDependencies": {
+    "ts-node": "^10.9.2"
   }
 }
diff --git a/validator-cli/.env.dist b/validator-cli/.env.dist
@@ -3,6 +3,8 @@ PRIVATE_KEY=
 # Devnet RPCs
 RPC_CHIADO=https://rpc.chiadochain.net
 RPC_ARB_SEPOLIA=https://sepolia-rollup.arbitrum.io/rpc
+RPC_GNOSIS=https://rpc.chiadochain.net
+RPC_ARB=https://sepolia-rollup.arbitrum.io/rpc
 RPC_SEPOLIA=
 
 # Testnet or Mainnet RPCs
@@ -16,9 +18,13 @@ VEAOUTBOX_ARB_TO_ETH_ADDRESS=0x209BFdC6B7c66b63A8382196Ba3d06619d0F12c9
 
 # Devnet Addresses
 VEAINBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS=0x906dE43dBef27639b1688Ac46532a16dc07Ce410
-VEAINBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS=0xAb53e341121448Ae259Da8fa17f216Cb0e21199C
 VEAOUTBOX_ARBSEPOLIA_TO_SEPOLIA_ADDRESS=0x906dE43dBef27639b1688Ac46532a16dc07Ce410
-VEAOUTBOX_ARBSEPOLIA_TO_CHIADO_ADDRESS=0xAb53e341121448Ae259Da8fa17f216Cb0e21199C
+
+#For arbToGnosis bridge
+VEAINBOX_ARB_TO_GNOSIS_ADDRESS=0x854374483572FFcD4d0225290346279d0718240b
+VEAOUTBOX_ARB_TO_GNOSIS_ADDRESS=0x2f1788F7B74e01c4C85578748290467A5f063B0b
+VEAROUTER_ARB_TO_GNOSIS_ADDRESS=0x5BE03fDE7794Bc188416ba16932510Ed1277b193
+GNOSIS_AMB_ADDRESS=0x8448E15d0e706C0298dECA99F0b4744030e59d7d
 
 TRANSACTION_BATCHER_CONTRACT_ADDRESS_SEPOLIA=0xe7953da7751063d0a41ba727c32c762d3523ade8
 TRANSACTION_BATCHER_CONTRACT_ADDRESS_CHIADO=0xcC0a08D4BCC5f91ee9a1587608f7a2975EA75d73
diff --git a/validator-cli/package.json b/validator-cli/package.json
@@ -13,7 +13,8 @@
     "start": "npx ts-node ./src/ArbToEth/watcher.ts",
     "start-chiado-devnet": "npx ts-node ./src/devnet/arbToChiado/happyPath.ts",
     "start-sepolia-devnet": "npx ts-node ./src/devnet/arbToSepolia/happyPath.ts",
-    "start-sepolia-testnet": "npx ts-node ./src/ArbToEth/watcherArbToEth.ts"
+    "start-sepolia-testnet": "npx ts-node ./src/ArbToEth/watcherArbToEth.ts",
+    "start-arbitrum-to-gnosis": "npx ts-node ./src/ArbToEth/watcherArbToGnosis.ts"
   },
   "dependencies": {
     "@arbitrum/sdk": "4.0.1",
@@ -25,5 +26,8 @@
     "typescript": "^4.9.5",
     "web3": "^1.10.4",
     "web3-batched-send": "^1.0.3"
+  },
+  "devDependencies": {
+    "ts-node": "^10.9.2"
   }
 }