fix: changes to mock deployments & related parameters

Author: hrishibhat

contracts/deploy/00-home-chain-arbitration.ts

@@ -39,8 +39,6 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     log: true,
   });
 
-  await deploy("ArbSysMock", { from: deployer, log: true });
-
   if (chainId === HomeChains.HARDHAT) {
     pnkByChain.set(
       HomeChains.HARDHAT,

contracts/deploy/01-foreign-chain.ts

@@ -53,7 +53,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   let nonce;
   if (chainId === ForeignChains.HARDHAT) {
     nonce = await ethers.provider.getTransactionCount(deployer);
-    nonce += 4; // HomeGatewayToEthereum deploy tx will be the 6th after this, same network for both home/foreign.
+    nonce += 5; // HomeGatewayToEthereum deploy tx will be the 6th after this, same network for both home/foreign.
   } else {
     const homeChainProvider = new providers.JsonRpcProvider(homeNetworks[chainId].url);
     nonce = await homeChainProvider.getTransactionCount(deployer);
@@ -66,13 +66,13 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
 
   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 FastSender for nonce %d: %s", nonce, fastBridgeSenderAddress);
 
   nonce += 5;
+
   const inboxAddress = chainId === ForeignChains.HARDHAT ? getContractAddress(deployer, nonce) : arbitrumInbox;
   console.log("calculated future inboxAddress for nonce %d: %s", nonce, inboxAddress);
 

contracts/deploy/02-home-chain.ts

@@ -18,10 +18,11 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   // ----------------------------------------------------------------------------------------------
   const hardhatDeployer = async () => {
     const fastBridgeReceiver = await deployments.get("FastBridgeReceiverOnEthereum");
-
+    const arbSysMock = await deploy("ArbSysMock", { from: deployer, log: true });
+    
     const fastBridgeSender = await deploy("FastBridgeSenderToEthereumMock", {
       from: deployer,
-      args: [deployer, fastBridgeReceiver.address, ethers.constants.AddressZero],
+      args: [deployer, fastBridgeReceiver.address, ethers.constants.AddressZero, arbSysMock.address],
       log: true,
     }); // nonce+0
 

contracts/src/bridge/mock/FastBridgeSenderToEthereumMock.sol

@@ -17,7 +17,7 @@ import "../FastBridgeSenderToEthereum.sol";
  * Counterpart of `FastBridgeReceiverOnEthereum`
  */
 contract FastBridgeSenderToEthereumMock is FastBridgeSenderToEthereum {
-    IArbSys public ARB_SYS_MOCK;
+    IArbSys public arbsys;
 
     // ************************************* //
     // *         Enums / Structs           * //
@@ -57,12 +57,10 @@ contract FastBridgeSenderToEthereumMock is FastBridgeSenderToEthereum {
     constructor(
         address _governor,
         IFastBridgeReceiver _fastBridgeReceiver,
-        address _fastBridgeSender
-    ) FastBridgeSenderToEthereum(_governor, _fastBridgeReceiver, _fastBridgeSender) {}
-
-    function set_arb(address _arbsys) external {
-        // arbsys = IArbSys(address(_arbsys));
-        ARB_SYS_MOCK = IArbSys(address(_arbsys));
+        address _fastBridgeSender,
+        address _arbsys
+    ) FastBridgeSenderToEthereum(_governor, _fastBridgeReceiver, _fastBridgeSender) {
+        arbsys = IArbSys(address(_arbsys));
     }
 
     // ************************************* //
@@ -102,7 +100,7 @@ contract FastBridgeSenderToEthereumMock is FastBridgeSenderToEthereum {
     // *       Internal       * //
     // ************************ //
     function _sendSafeMock(address _receiver, bytes memory _calldata) internal returns (uint256) {
-        uint256 withdrawalId = ARB_SYS_MOCK.sendTxToL1(_receiver, _calldata);
+        uint256 withdrawalId = arbsys.sendTxToL1(_receiver, _calldata);
         emit L2ToL1TxCreated(withdrawalId);
         return withdrawalId;
     }

contracts/test/pre-alpha1/index.ts

@@ -10,7 +10,6 @@ import {
   ArbitrableExample,
   FastBridgeSenderToEthereum,
   HomeGatewayToEthereum,
-  ArbSysMock,
   InboxMock,
 } from "../../typechain-types";
 import { OutgoingMessage } from "http";
@@ -32,7 +31,7 @@ describe("Demo pre-alpha1", function () {
   }
 
   let deployer, relayer, bridger, challenger, innocentBystander;
-  let ng, disputeKit, pnk, core, fastBridgeReceiver, foreignGateway, arbitrable, fastBridgeSender, homeGateway, arbsys, inbox;
+  let ng, disputeKit, pnk, core, fastBridgeReceiver, foreignGateway, arbitrable, fastBridgeSender, homeGateway, inbox;
 
   before("Setup", async () => {
     deployer = (await getNamedAccounts()).deployer;
@@ -44,7 +43,7 @@ describe("Demo pre-alpha1", function () {
 
     await deployments.fixture(["Arbitration", "ForeignGateway", "HomeGateway"], {
       fallbackToGlobal: true,
-      keepExistingDeployments: true,
+      keepExistingDeployments: false,
     });
     ng = <IncrementalNG>await ethers.getContract("IncrementalNG");
     disputeKit = <KlerosCore>await ethers.getContract("DisputeKitClassic");
@@ -55,7 +54,6 @@ describe("Demo pre-alpha1", function () {
     arbitrable = <ArbitrableExample>await ethers.getContract("ArbitrableExample");
     fastBridgeSender = <FastBridgeSenderToEthereum>await ethers.getContract("FastBridgeSenderToEthereumMock");
     homeGateway = <HomeGatewayToEthereum>await ethers.getContract("HomeGatewayToEthereum");
-    arbsys = <ArbSysMock>await ethers.getContract("ArbSysMock");
     inbox = <InboxMock>await ethers.getContract("InboxMock");
   });
 
@@ -223,7 +221,10 @@ describe("Demo pre-alpha1", function () {
     expect(tx).to.emit(foreignGateway, "OutgoingDispute"); //.withArgs(disputeId, deployer.address);
     console.log(`disputeId: ${disputeId}`);
 
-    const events = await foreignGateway.queryFilter(OutgoingMessage);
+    const eventOutgoingDispute = foreignGateway.filters.OutgoingDispute();
+    const events = await foreignGateway.queryFilter(eventOutgoingDispute, "latest");
+    const eventDisputeCreation = foreignGateway.filters.DisputeCreation();
+    const events2 = await foreignGateway.queryFilter(eventDisputeCreation, "latest");
 
 
     const lastBlock = await ethers.provider.getBlock(tx.blockNumber - 1);
@@ -232,12 +233,24 @@ describe("Demo pre-alpha1", function () {
       [31337, lastBlock.hash, ethers.utils.toUtf8Bytes("createDispute"), disputeId, 2, "0x00", arbitrable.address]
     );
 
+    expect(events[0].event).to.equal("OutgoingDispute");
+    expect(events[0].args.disputeHash).to.equal(disputeHash);
+    expect(events[0].args.blockhash).to.equal(lastBlock.hash);
+    expect(events[0].args.localDisputeID).to.equal(disputeId);
+    expect(events[0].args._choices).to.equal(2);
+    expect(events[0].args._extraData).to.equal("0x00");
+    expect(events[0].args.arbitrable).to.equal(arbitrable.address);
+
+    expect(events2[0].event).to.equal("DisputeCreation");
+    expect(events2[0].args._arbitrable).to.equal(arbitrable.address);
+    expect(events2[0].args._disputeID).to.equal(disputeId);
     // Relayer tx
     const tx2 = await homeGateway
       .connect(await ethers.getSigner(relayer))
       .relayCreateDispute(31337, lastBlock.hash, disputeId, 2, "0x00", arbitrable.address, {
         value: arbitrationCost,
       });
+      
     expect(tx2).to.emit(homeGateway, "Dispute");
 
     const tx3 = await core.draw(1, 1000);
@@ -310,7 +323,6 @@ describe("Demo pre-alpha1", function () {
     await expect(
       fastBridgeReceiver.connect(bridger).verifyAndRelay(ticketID, blockNumber, messageData)
     ).to.be.revertedWith("Claim is challenged");
-    await fastBridgeSender.set_arb(arbsys.address);
 
     const data = await ethers.utils.defaultAbiCoder.decode(["address", "bytes"], messageData);
     const tx7 = await fastBridgeSender
@@ -457,7 +469,6 @@ describe("Demo pre-alpha1", function () {
     await expect(
       fastBridgeReceiver.connect(bridger).verifyAndRelay(ticketID, blockNumber, fakeData)
     ).to.be.revertedWith("Claim is challenged");
-    await fastBridgeSender.set_arb(arbsys.address);
 
     let data = await ethers.utils.defaultAbiCoder.decode(["address", "bytes"], fakeData);