Testnet preparation, migration to Sepolia, solc 0.8.24, node 18, yarn 4

contracts/README.md

@@ -8,19 +8,20 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 
 ### Current version
 
-#### Goerli
+#### Sepolia
 
-- [RouterArbToGnosisDevnet](https://goerli.etherscan.io/address/0xAb53e341121448Ae259Da8fa17f216Cb0e21199C)
-- [VeaOutboxArbToEthDevnet](https://goerli.etherscan.io/address/0x906dE43dBef27639b1688Ac46532a16dc07Ce410)
+- [VeaOutboxArbToEthDevnet](https://sepolia.etherscan.io/address/0x5AD255400913515C8DA7E82E6b8A109fA5c46135)
 
-#### Arbitrum Goerli
+#### Arbitrum Sepolia
 
-- [VeaInboxArbToEthDevnet](https://goerli.arbiscan.io/address/0x906dE43dBef27639b1688Ac46532a16dc07Ce410)
-- [VeaInboxArbToGnosisDevnet](https://goerli.arbiscan.io/address/0xAb53e341121448Ae259Da8fa17f216Cb0e21199C)
+- [VeaInboxArbToEthDevnet](https://sepolia.arbiscan.io/address/0x77e95F54032f467eC45c48C6affc203f93858783)
 
 #### Chiado
 
-- [VeaOutboxArbToGnosisDevnet](https://blockscout.com/gnosis/chiado/address/0xAb53e341121448Ae259Da8fa17f216Cb0e21199C)
+- [VeaInboxGnosisToArbDevnet](https://blockscout.com/gnosis/chiado/address/0xc0804E4FcEEfD958050356A429DAaaA71aA39385)
+- [VeaInboxGnosisToArbTestnet](https://blockscout.com/gnosis/chiado/address/0xC21c20a719fAc23c54c336FA0E16a0CFdC4baA00)
+- [VeaOutboxArbToGnosisDevnet](https://blockscout.com/gnosis/chiado/address/0x9481b3A49ac67d03D9022E6200eFD81850BADDB4)
+- [VeaOutboxArbToGnosisTestnet](https://blockscout.com/gnosis/chiado/address/0x931FA807020231bCE1340Be8E1e5054207BbAFEd)
 
 ## Getting Started
 
@@ -86,13 +87,13 @@ yarn start-local
 ##### Testnets
 
 ```bash
-# ArbitrumGoerli -> Goerli
-yarn deploy --network goerli --tags ArbGoerliToGoerliOutbox
-yarn deploy --network arbitrumGoerli --tags ArbGoerliToGoerliInbox
+# arbitrumSepolia -> Sepolia
+yarn deploy --network sepolia --tags ArbSepoliaToSepoliaOutbox
+yarn deploy --network arbitrumSepolia --tags ArbSepoliaToSepoliaInbox
 
-# ArbitrumGoerli -> Chiado
-yarn deploy --network chiado --tags ArbGoerliToChiadoOutbox
-yarn deploy --network arbitrumGoerli --tags ArbGoerliToChiadoInbox
+# arbitrumSepolia -> Chiado
+yarn deploy --network chiado --tags ArbSepoliaToChiadoOutbox
+yarn deploy --network arbitrumSepolia --tags ArbSepoliaToChiadoInbox
 ```
 
 ##### Mainnets
@@ -122,8 +123,8 @@ This must be done for each network separately.
 
 ```bash
 # explorer
-yarn etherscan-verify --network <arbitrumGoerli|arbitrum|goerli|mainnet|chiado|gnosischain>
+yarn etherscan-verify --network <arbitrumSepolia|arbitrum|sepolia|mainnet|chiado|gnosischain>
 
 # sourcify
-yarn sourcify --network <arbitrumGoerli|arbitrum|goerli|mainnet|chiado|gnosischain>
+yarn sourcify --network <arbitrumSepolia|arbitrum|sepolia|mainnet|chiado|gnosischain>
 ```

contracts/deploy/01-outbox/01-arb-goerli-to-chiado-outbox.ts → contracts/deploy/01-outbox/01-arb-sepolia-to-chiado-outbox.ts

@@ -11,25 +11,26 @@ enum ReceiverChains {
 
 const paramsByChainId = {
   GNOSIS_CHIADO: {
-    deposit: parseEther("0.001"),
-    epochPeriod: 1800, // 60 min
-    claimDelay: 0, // Assume no sequencer backdating
-    challengePeriod: 0, // 30 min
+    deposit: parseEther("0.1"),
+    epochPeriod: 1800, // 30 min
+    minChallengePeriod: 0, // 30 min
     numEpochTimeout: 10000000000000, // never
-    maxMissingBlocks: 10000000000000,
     amb: "0x99Ca51a3534785ED619f46A79C7Ad65Fa8d85e7a",
-    senderChainId: 421613,
+    sequencerLimit: 86400,
+    maxMissingBlocks: 10000000000000,
+    routerChainId: 11155111,
+    WETH: "0x8d74e5e4DA11629537C4575cB0f33b4F0Dfa42EB",
   },
   HARDHAT: {
-    deposit: parseEther("5"), // 120 xDAI budget for timeout
-    // Average happy path wait time is 22.5 mins, assume no censorship
-    epochPeriod: 600, // 15 min
-    challengePeriod: 600, // 15 min (assume no sequencer backdating)
+    deposit: parseEther("1"),
+    epochPeriod: 600, // 10 min
+    minChallengePeriod: 600, // 10 min
     numEpochTimeout: 24, // 6 hours
-    claimDelay: 2,
     amb: ethers.constants.AddressZero,
+    sequencerLimit: 0,
     maxMissingBlocks: 10000000000000,
-    senderChainId: 421613,
+    routerChainId: 31337,
+    WETH: ethers.constants.AddressZero,
   },
 };
 
@@ -44,17 +45,26 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   console.log("deploying to chainId %s with deployer %s", chainId, deployer);
 
   const senderNetworks = {
-    GNOSIS_CHIADO: config.networks.arbitrumGoerli,
+    GNOSIS_CHIADO: config.networks.arbitrumSepolia,
     HARDHAT: config.networks.localhost,
   };
 
   const routerNetworks = {
-    GNOSIS_CHIADO: config.networks.goerli,
+    GNOSIS_CHIADO: config.networks.sepolia,
     HARDHAT: config.networks.localhost,
   };
 
-  const { deposit, epochPeriod, challengePeriod, numEpochTimeout, claimDelay, amb, maxMissingBlocks } =
-    paramsByChainId[ReceiverChains[chainId]];
+  const {
+    deposit,
+    epochPeriod,
+    routerChainId,
+    minChallengePeriod,
+    numEpochTimeout,
+    amb,
+    maxMissingBlocks,
+    sequencerLimit,
+    WETH,
+  } = paramsByChainId[ReceiverChains[chainId]];
 
   // Hack to predict the deployment address on the sender chain.
   // TODO: use deterministic deployments
@@ -72,13 +82,14 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
       args: [
         deposit,
         epochPeriod,
-        challengePeriod,
+        minChallengePeriod,
         numEpochTimeout,
-        claimDelay,
-        veaInboxAddress,
         amb,
         ethers.constants.AddressZero,
+        sequencerLimit,
         maxMissingBlocks,
+        routerChainId,
+        WETH,
       ],
       log: true,
     });
@@ -97,15 +108,23 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     const routerChainProvider = new providers.JsonRpcProvider(routerNetworks[ReceiverChains[chainId]].url);
     let nonceRouter = await routerChainProvider.getTransactionCount(deployer);
 
-    const veaInboxAddress = getContractAddress(deployer, nonce);
-    console.log("calculated future veaInbox for nonce %d: %s", nonce, veaInboxAddress);
-
     const routerAddress = getContractAddress(deployer, nonceRouter);
     console.log("calculated future router for nonce %d: %s", nonce, routerAddress);
 
     const txn = await deploy("VeaOutboxArbToGnosisDevnet", {
       from: deployer,
-      args: [deposit, epochPeriod, challengePeriod, numEpochTimeout, claimDelay, amb, routerAddress, maxMissingBlocks],
+      args: [
+        deposit,
+        epochPeriod,
+        minChallengePeriod,
+        numEpochTimeout,
+        amb,
+        routerAddress,
+        sequencerLimit,
+        maxMissingBlocks,
+        routerChainId,
+        WETH,
+      ],
       log: true,
       ...gasOptions,
     });
@@ -121,7 +140,7 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   }
 };
 
-deployOutbox.tags = ["ArbGoerliToChiadoOutbox"];
+deployOutbox.tags = ["ArbSepoliaToChiadoOutbox"];
 deployOutbox.skip = async ({ getChainId }) => {
   const chainId = Number(await getChainId());
   console.log(chainId);

contracts/deploy/01-outbox/01-arb-goerli-to-goerli-outbox.ts → contracts/deploy/01-outbox/01-arb-sepolia-to-sepolia-outbox.ts

@@ -5,29 +5,26 @@ import getContractAddress from "../../deploy-helpers/getContractAddress";
 import { ethers } from "hardhat";
 
 enum ReceiverChains {
-  ETHEREUM_GOERLI = 5,
+  ETHEREUM_SEPOLIA = 11155111,
   HARDHAT = 31337,
 }
 
 const paramsByChainId = {
-  ETHEREUM_GOERLI: {
+  ETHEREUM_SEPOLIA: {
     deposit: parseEther("0.001"),
     // Average happy path wait time is 1 hour (30 min, 90 min), happy path only
     epochPeriod: 1800, // 30 min
-    claimDelay: 0, // Assume no sequencer backdating
-    challengePeriod: 0, // 0 min
+    minChallengePeriod: 0, // 0 min
     numEpochTimeout: 10000000000000, // never
     maxMissingBlocks: 10000000000000,
-    arbitrumBridge: "0xC1Ebd02f738644983b6C4B2d440b8e77DdE276Bd", // https://developer.arbitrum.io/useful-addresses
+    arbitrumBridge: "0x38f918D0E9F1b721EDaA41302E399fa1B79333a9", // https://developer.arbitrum.io/useful-addresses
   },
   HARDHAT: {
     deposit: parseEther("10"), // 120 eth budget for timeout
     // Average happy path wait time is 45 mins, assume no censorship
-    epochPeriod: 1800, // 30 min
-    claimDelay: 0, // 30 hours (24 hours sequencer backdating + 6 hour buffer)
-    challengePeriod: 1800, // 30 min (assume no sequencer backdating)
+    epochPeriod: 600, // 10 min
+    minChallengePeriod: 600, // 10 min (assume no sequencer backdating)
     numEpochTimeout: 10000000000000, // 6 hours
-    senderChainId: 31337,
     maxMissingBlocks: 10000000000000,
     arbitrumBridge: ethers.constants.AddressZero,
   },
@@ -44,11 +41,11 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   console.log("deploying to chainId %s with deployer %s", chainId, deployer);
 
   const senderNetworks = {
-    ETHEREUM_GOERLI: config.networks.arbitrumGoerli,
+    ETHEREUM_SEPOLIA: config.networks.arbitrumSepolia,
     HARDHAT: config.networks.localhost,
   };
 
-  const { deposit, epochPeriod, challengePeriod, numEpochTimeout, claimDelay, maxMissingBlocks, arbitrumBridge } =
+  const { deposit, epochPeriod, numEpochTimeout, minChallengePeriod, maxMissingBlocks, arbitrumBridge } =
     paramsByChainId[ReceiverChains[chainId]];
 
   // Hack to predict the deployment address on the sender chain.
@@ -81,9 +78,8 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
         arbSysAddress,
         deposit,
         epochPeriod,
-        challengePeriod,
+        minChallengePeriod,
         numEpochTimeout,
-        claimDelay,
         veaInboxAddress,
         bridgeAddress,
         maxMissingBlocks,
@@ -114,9 +110,8 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
         args: [
           deposit,
           epochPeriod,
-          challengePeriod,
+          minChallengePeriod,
           numEpochTimeout,
-          claimDelay,
           veaInboxAddress,
           arbitrumBridge,
           maxMissingBlocks,
@@ -133,11 +128,11 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   }
 };
 
-deployOutbox.tags = ["ArbGoerliToGoerliOutbox"];
+deployOutbox.tags = ["ArbSepoliaToSepoliaOutbox"];
 deployOutbox.skip = async ({ getChainId }) => {
   const chainId = Number(await getChainId());
   console.log(chainId);
-  return !(chainId === 5 || chainId === 31337);
+  return !ReceiverChains[chainId];
 };
 
 export default deployOutbox;