Merge dev

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

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;