test: adapt deployment scripts

Author: shotaronowhere

contracts/deploy/01-foreign-chain.ts

@@ -2,7 +2,7 @@ import { parseEther } from "ethers/lib/utils";
 
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-
+import { ethers } from "hardhat";
 import getContractAddress from "../deploy-helpers/getContractAddress";
 
 enum ForeignChains {
@@ -15,16 +15,22 @@ const paramsByChainId = {
     deposit: parseEther("0.1"),
     epochPeriod: 86400, // 1 day
     homeChainId: 42161, // arbitrum
+    arbInbox: "0x4Dbd4fc535Ac27206064B68FfCf827b0A60BAB3f", // https://developer.offchainlabs.com/docs/useful_addresses
+    genesis: 1652709415 // sample genesis time
   },
   4: {
     deposit: parseEther("0.1"),
     epochPeriod: 120, // 2 min
-    homeChainId: 421611,
+    homeChainId: 421611, // arbitrum testnet
+    arbInbox: "0x578BAde599406A8fE3d24Fd7f7211c0911F5B29e", //https://developer.offchainlabs.com/docs/useful_addresses
+    genesis: 1652709415 // sample genesis time
   },
   31337: {
     deposit: parseEther("0.1"),
     epochPeriod: 120, // 2 min
     homeChainId: 31337,
+    arbInbox: ethers.constants.AddressZero,
+    genesis: 1652709415 // sample genesis time
   },
 };
 
@@ -56,20 +62,25 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
     nonce = await homeChainProvider.getTransactionCount(deployer);
     nonce += 1; // HomeGatewayToEthereum deploy tx will the third tx after this on its home network, so we add two to the current nonce.
   }
-  const { deposit, epochPeriod, homeChainId } = paramsByChainId[chainId];
+  const { deposit, epochPeriod, homeChainId, arbInbox, genesis } = paramsByChainId[chainId];
   const bridgeAlpha = 5000;
   const homeChainIdAsBytes32 = hexZeroPad(homeChainId, 32);
   const chainIdAsBytes32 = hexZeroPad("0x" + chainId.toString(16), 32);
 
   const homeGatewayAddress = getContractAddress(deployer, nonce);
   console.log("calculated future HomeGatewayToEthereum address for nonce %d: %s", nonce, homeGatewayAddress);
+  nonce -= 1;
+  const fastBridgeSenderAddress = getContractAddress(deployer, nonce);
+  console.log("calculated future fastBridgeSender address for nonce %d: %s", nonce, fastBridgeSenderAddress);
 
   const fastBridgeReceiver = await deploy("FastBridgeReceiverOnEthereum", {
     from: deployer,
     args: [
-      ethers.constants.AddressZero, // should be Arbitrum Inbox
+      arbInbox, // should be Arbitrum Inbox
       deposit,
       epochPeriod,
+      fastBridgeSenderAddress,
+      genesis // sample genesis time
     ],
     log: true,
   });

contracts/deploy/02-home-chain.ts

@@ -20,9 +20,10 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     chainId === 31337
       ? await deployments.get("FastBridgeReceiverOnEthereum")
       : await hre.companionNetworks.foreign.deployments.get("FastBridgeReceiverOnEthereum");
+  //const genesisSynchronization = fastBridgeReceiver.
   const fastBridgeSender = await deploy("FastBridgeSenderToEthereum", {
     from: deployer,
-    args: [deployer, fastBridgeReceiver.address, ethers.constants.AddressZero],
+    args: [fastBridgeReceiver.address, 120, 1652709415],
     log: true,
   }); // nonce+0
 
@@ -39,7 +40,9 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       klerosCore.address, 
       fastBridgeSender.address, 
       foreignGateway.address, 
-      foreignChainId],
+      foreignChainId,
+      chainId
+    ],
     log: true,
   }); // nonce+1
 
@@ -49,6 +52,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   if (safeBridgeSender === ethers.constants.AddressZero) {
     await execute("FastBridgeReceiverOnEthereum", { from: deployer, log: true }, "setSafeBridgeSender", fastBridgeSender.address);
   }
+
 };
 
 deployHomeGateway.tags = ["HomeChain", "HomeGateway"];

contracts/src/bridge/FastBridgeReceiverOnEthereum.sol

@@ -55,11 +55,13 @@ contract FastBridgeReceiverOnEthereum is SafeBridgeReceiverOnEthereum, IFastBrid
     constructor(
         address _inbox,
         uint256 _deposit,
-        uint256 _epochPeriod
-    ) SafeBridgeReceiverOnEthereum(_inbox) {
+        uint256 _epochPeriod,
+        address _safeBridgeSender,
+        uint256 _genesis
+    ) SafeBridgeReceiverOnEthereum(_inbox, _safeBridgeSender) {
         deposit = _deposit;
         epochPeriod = _epochPeriod;
-        genesis = block.timestamp;
+        genesis = _genesis;
     }
 
     // ************************************* //

contracts/src/bridge/FastBridgeSenderToEthereum.sol

@@ -53,8 +53,8 @@ contract FastBridgeSenderToEthereum is SafeBridgeSenderToEthereum, IFastBridgeSe
         uint256 _genesis
     ) SafeBridgeSenderToEthereum() {
         fastBridgeReceiver = _fastBridgeReceiver;
-        genesis = _genesis;
         epochPeriod = _epochPeriod;
+        genesis = _genesis;
     }
 
     // ************************************* //

contracts/src/bridge/SafeBridgeReceiverOnEthereum.sol

@@ -24,19 +24,16 @@ contract SafeBridgeReceiverOnEthereum is ISafeBridgeReceiver {
     // ************************************* //
 
     // will be set as immutable in production deployment for gas optimization
-    address public safeBridgeSender; // The address of the Safe Bridge sender on Arbitrum.
+    address public immutable safeBridgeSender; // The address of the Safe Bridge sender on Arbitrum.
     IInbox public immutable inbox; // The address of the Arbitrum Inbox contract.
 
     /**
      * @dev Constructor.
      * @param _inbox The address of the Arbitrum Inbox contract.
      */
-    constructor(address _inbox) {
+    constructor(address _inbox, address _safeBridgeSender) {
         inbox = IInbox(_inbox);
-    }
-
-    function setSafeBridgeSender(address _safeBridgeSender) external {
-        if (safeBridgeSender == address(0)) safeBridgeSender = _safeBridgeSender;
+        safeBridgeSender = _safeBridgeSender;
     }
 
     // ************************************* //

contracts/src/gateway/ForeignGatewayOnEthereum.sol

@@ -46,8 +46,8 @@ contract ForeignGatewayOnEthereum is IForeignGateway {
     address public governor;
     IFastBridgeReceiver public fastbridge;
     IFastBridgeReceiver public depreciatedFastbridge;
-    uint256 fastbridgeExpiration;
-    address public homeGateway;
+    uint256 public fastbridgeExpiration;
+    address public immutable homeGateway;
 
     event OutgoingDispute(
         bytes32 disputeHash,
@@ -90,10 +90,11 @@ contract ForeignGatewayOnEthereum is IForeignGateway {
 
     /** @dev Changes the fastBridge, useful to increase the claim deposit.
      *  @param _fastbridge The address of the new fastBridge.
+     *  @param _gracePeriod The duration to accept messages from the deprecated bridge (if at all).
      */
-    function changeFastbridge(IFastBridgeReceiver _fastbridge) external onlyByGovernor {
+    function changeFastbridge(IFastBridgeReceiver _fastbridge, uint256 _gracePeriod) external onlyByGovernor {
         // grace period to relay remaining messages in the relay / bridging process
-        fastbridgeExpiration = block.timestamp + _fastbridge.epochPeriod() + 1209600; // 2 weeks
+        fastbridgeExpiration = block.timestamp + _fastbridge.epochPeriod() + _gracePeriod; // 2 weeks
         depreciatedFastbridge = fastbridge;
         fastbridge = _fastbridge;
     }

contracts/src/gateway/HomeGatewayToEthereum.sol

@@ -25,11 +25,11 @@ contract HomeGatewayToEthereum is IHomeGateway {
     mapping(bytes32 => uint256) public disputeHashtoID;
 
     address public governor;
-    IArbitrator public arbitrator;
+    IArbitrator public immutable arbitrator;
     IFastBridgeSender public fastbridge;
     address public override foreignGateway;
-    uint256 public override chainID;
-    uint256 public override foreignChainID;
+    uint256 public immutable override chainID;
+    uint256 public immutable override foreignChainID;
 
     struct RelayedData {
         uint256 arbitrationCost;
@@ -42,17 +42,15 @@ contract HomeGatewayToEthereum is IHomeGateway {
         IArbitrator _arbitrator,
         IFastBridgeSender _fastbridge,
         address _foreignGateway,
-        uint256 _foreignChainID
+        uint256 _foreignChainID,
+        uint256 _chainID
     ) {
         governor = _governor;
         arbitrator = _arbitrator;
         fastbridge = _fastbridge;
         foreignGateway = _foreignGateway;
         foreignChainID = _foreignChainID;
-
-        assembly {
-            sstore(chainID.slot, chainid())
-        }
+        chainID = _chainID;
 
         emit MetaEvidence(0, "BRIDGE");
     }