chore: remove Vea from the test and deploy scripts, created a VeaMock, removed Rinkeby

Author: jaybuidl

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
- "solidity.compileUsingRemoteVersion": "v0.8.10+commit.fc410830",
+ "solidity.compileUsingRemoteVersion": "v0.8.9+commit.e5eed63a",
  "cSpell.words": [
  "arbitrum",
  "IERC",

contracts/.solhintignore

@@ -1 +1,2 @@
 node_modules
+src/**/mock/*.sol

contracts/README.md

@@ -113,27 +113,22 @@ The complete deployment is multi-chain, so a deployment to the local network can
 **Shell 1: the node**
 
 ```bash
-yarn hardhat node --tags nothing
+yarn node --tags nothing
 ```
 
 **Shell 2: the deploy script**
 
 ```bash
-yarn hardhat deploy --network localhost --tags HomeChain
+yarn deploy --network localhost --tags <Arbitration|VeaMock>
 ```
 
 #### 3. Deploy to Public Testnets
 
 ```bash
 # Goerli
-yarn hardhat deploy --network arbitrumGoerli --tags Arbitration
-yarn hardhat deploy --network goerli --tags ForeignChain
-yarn hardhat deploy --network arbitrumGoerli --tags HomeChain
-
-# Rinkeby
-yarn hardhat deploy --network arbitrumRinkeby --tags Arbitration
-yarn hardhat deploy --network rinkeby --tags ForeignChain
-yarn hardhat deploy --network arbitrumRinkeby --tags HomeChain
+yarn deploy --network arbitrumGoerli --tags Arbitration
+yarn deploy --network goerli --tags ForeignGateway
+yarn deploy --network arbitrumGoerli --tags HomeGateway
 ```
 
 The deployed addresses should be output to the screen after the deployment is complete.
@@ -144,21 +139,21 @@ If you miss that, you can always go to the `deployments/<network>` directory and
 **Shell 1: the node**
 
 ```bash
-yarn hardhat node --tags Arbitration,ForeignGateway,HomeGateway
+yarn node --tags Arbitration,VeaMock
 ```
 
-**Shell 2: the test script**
+**Shell 2: the test scripts**
 
 ```bash
-yarn hardhat test --network localhost test/pre-alpha1/index.ts
+yarn test --network localhost
 ```
 
 #### 4. Verify the Source Code for Contracts
 
 This must be done for each network separately.
 
 ```bash
-yarn hardhat --network <arbitrumGoerli|arbitrumRinkeby|arbitrum|goerli|rinkeby|mainnet> etherscan-verify
+yarn --network <arbitrumGoerli|arbitrumRinkeby|arbitrum|goerli|rinkeby|mainnet> etherscan-verify
 ```
 
 ## Ad-hoc procedures
@@ -177,7 +172,7 @@ yarn hardhat run scripts/getCourtsV1.ts --network mainnet | tee courts.v1.json
 Shell 1:
 
 ```bash
-yarn hardhat node --tags Arbitration
+yarn node --tags Arbitration
 ```
 
 Shell 2:

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

@@ -4,14 +4,12 @@ import { BigNumber } from "ethers";
 
 enum HomeChains {
  ARBITRUM_ONE = 42161,
- ARBITRUM_RINKEBY = 421611,
  ARBITRUM_GOERLI = 421613,
  HARDHAT = 31337,
 }
 
 const pnkByChain = new Map<HomeChains, string>([
  [HomeChains.ARBITRUM_ONE, "0x330bD769382cFc6d50175903434CCC8D206DCAE5"],
- [HomeChains.ARBITRUM_RINKEBY, "0x364530164a2338cdba211f72c1438eb811b5c639"],
  [HomeChains.ARBITRUM_GOERLI, "0x4DEeeFD054434bf6721eF39Aa18EfB3fd0D12610"],
 ]);
 

contracts/deploy/01-foreign-chain.ts

@@ -0,0 +1,69 @@
+import { parseEther } from "ethers/lib/utils";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+import getContractAddress from "../deploy-helpers/getContractAddress";
+
+enum ForeignChains {
+ ETHEREUM_MAINNET = 1,
+ ETHEREUM_GOERLI = 5,
+}
+
+const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+ const { ethers, deployments, getNamedAccounts, getChainId, config } = hre;
+ const { deploy } = deployments;
+ const { hexZeroPad, hexlify } = ethers.utils;
+
+ // fallback to hardhat node signers on local network
+ const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
+ const chainId = Number(await getChainId());
+ console.log("deploying to chainId %s with deployer %s", chainId, deployer);
+
+ const homeNetworks = {
+ 1: config.networks.arbitrum,
+ 5: config.networks.arbitrumGoerli,
+ };
+
+ // Hack to predict the deployment address on the home chain.
+ // TODO: use deterministic deployments
+ const homeChainProvider = new ethers.providers.JsonRpcProvider(homeNetworks[chainId].url);
+ let nonce = await homeChainProvider.getTransactionCount(deployer);
+ nonce += 2; // HomeGatewayToEthereum deploy tx will the third tx after this on its home network, so we add two to the current nonce.
+ const homeChainId = (await homeChainProvider.getNetwork()).chainId;
+ const homeChainIdAsBytes32 = hexZeroPad(hexlify(homeChainId), 32);
+ const homeGatewayAddress = getContractAddress(deployer, nonce);
+ console.log("calculated future HomeGatewayToEthereum address for nonce %d: %s", nonce, homeGatewayAddress);
+
+ const veaReceiver = await deployments.get("FastBridgeReceiverOnEthereum");
+
+ const foreignGateway = await deploy("ForeignGatewayOnEthereum", {
+ from: deployer,
+ contract: "ForeignGateway",
+ args: [
+ deployer,
+ veaReceiver.address,
+ [ethers.BigNumber.from(10).pow(17)],
+ homeGatewayAddress,
+ homeChainIdAsBytes32,
+ ],
+ gasLimit: 4000000,
+ log: true,
+ });
+
+ // TODO: change me
+ const metaEvidenceUri =
+ "https://raw.githubusercontent.com/kleros/kleros-v2/master/contracts/deployments/rinkeby/MetaEvidence_ArbitrableExample.json";
+
+ await deploy("ArbitrableExample", {
+ from: deployer,
+ args: [foreignGateway.address, metaEvidenceUri],
+ log: true,
+ });
+};
+
+deployForeignGateway.tags = ["ForeignChain", "ForeignGateway"];
+deployForeignGateway.skip = async ({ getChainId }) => {
+ const chainId = Number(await getChainId());
+ return !ForeignChains[chainId];
+};
+
+export default deployForeignGateway;