Merge branch 'dev' into feat(web)/dashboard-pixelart

Author: kemuru

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

@@ -18,7 +18,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003"; // General court, 3 jurors
   const weth = await deployments.get("WETH");
 
-  const disputeTemplateRegistry = await deployUpgradable(hre, "DisputeTemplateRegistry", {
+  const disputeTemplateRegistry = await deployUpgradable(deployments, "DisputeTemplateRegistry", {
     from: deployer,
     args: [deployer],
     log: true,

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

@@ -52,12 +52,16 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     randomizerByChain.set(HomeChains[HomeChains[chainId]], randomizerMock.address);
   }
 
-  await deployUpgradable(hre, "PolicyRegistry", { from: deployer, args: [deployer], log: true });
+  await deployUpgradable(deployments, "PolicyRegistry", { from: deployer, args: [deployer], log: true });
 
   const randomizer = randomizerByChain.get(Number(await getChainId())) ?? AddressZero;
-  const rng = await deployUpgradable(hre, "RandomizerRNG", { from: deployer, args: [randomizer, deployer], log: true });
+  const rng = await deployUpgradable(deployments, "RandomizerRNG", {
+    from: deployer,
+    args: [randomizer, deployer],
+    log: true,
+  });
 
-  const disputeKit = await deployUpgradable(hre, "DisputeKitClassic", {
+  const disputeKit = await deployUpgradable(deployments, "DisputeKitClassic", {
     from: deployer,
     args: [deployer, AddressZero],
     log: true,
@@ -72,7 +76,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const devnet = isDevnet(hre.network);
   const minStakingTime = devnet ? 180 : 1800;
   const maxFreezingTime = devnet ? 600 : 1800;
-  const sortitionModule = await deployUpgradable(hre, "SortitionModule", {
+  const sortitionModule = await deployUpgradable(deployments, "SortitionModule", {
     from: deployer,
     args: [deployer, klerosCoreAddress, minStakingTime, maxFreezingTime, rng.address, RNG_LOOKAHEAD],
     log: true,
@@ -84,7 +88,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const minStake = BigNumber.from(10).pow(20).mul(2);
   const alpha = 10000;
   const feeForJuror = BigNumber.from(10).pow(17);
-  const klerosCore = await deployUpgradable(hre, "KlerosCore", {
+  const klerosCore = await deployUpgradable(deployments, "KlerosCore", {
     from: deployer,
     args: [
       deployer,

contracts/deploy/00-rng.ts

@@ -48,7 +48,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   }
 
   const randomizer = randomizerByChain.get(Number(await getChainId())) ?? AddressZero;
-  await deployUpgradable(hre, "RandomizerRNG", { from: deployer, args: [randomizer, deployer], log: true });
+  await deployUpgradable(deployments, "RandomizerRNG", { from: deployer, args: [randomizer, deployer], log: true });
   const rng = await deploy("BlockHashRNG", {
     from: deployer,
     args: [],

contracts/deploy/01-foreign-gateway-on-ethereum.ts

@@ -30,7 +30,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
 
   const homeChainId = (await homeChainProvider.getNetwork()).chainId;
   const homeChainIdAsBytes32 = hexZeroPad(hexlify(homeChainId), 32);
-  await deployUpgradable(hre, "ForeignGatewayOnEthereum", {
+  await deployUpgradable(deployments, "ForeignGatewayOnEthereum", {
     from: deployer,
     contract: "ForeignGateway",
     args: [deployer, veaOutbox.address, homeChainIdAsBytes32, homeGatewayAddress],

contracts/deploy/01-foreign-gateway-on-gnosis.ts

@@ -33,7 +33,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
 
   const homeChainId = (await homeChainProvider.getNetwork()).chainId;
   const homeChainIdAsBytes32 = hexZeroPad(hexlify(homeChainId), 32);
-  await deployUpgradable(hre, "ForeignGatewayOnGnosis", {
+  await deployUpgradable(deployments, "ForeignGatewayOnGnosis", {
     from: deployer,
     contract: "ForeignGateway",
     args: [deployer, veaOutbox.address, homeChainIdAsBytes32, homeGatewayAddress],

contracts/deploy/02-home-gateway-to-ethereum.ts

@@ -23,7 +23,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const foreignChainName = await hre.companionNetworks.foreignGoerli.deployments.getNetworkName();
   console.log("Using ForeignGateway %s on chainId %s (%s)", foreignGateway.address, foreignChainId, foreignChainName);
 
-  await deployUpgradable(hre, "HomeGatewayToEthereum", {
+  await deployUpgradable(deployments, "HomeGatewayToEthereum", {
     from: deployer,
     contract: "HomeGateway",
     args: [

contracts/deploy/02-home-gateway-to-gnosis.ts

@@ -23,7 +23,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const foreignChainName = await hre.companionNetworks.foreignChiado.deployments.getNetworkName();
   console.log("Using ForeignGateway %s on chainId %s (%s)", foreignGateway.address, foreignChainId, foreignChainName);
 
-  await deployUpgradable(hre, "HomeGatewayToGnosis", {
+  await deployUpgradable(deployments, "HomeGatewayToGnosis", {
     from: deployer,
     contract: "HomeGateway",
     args: [deployer, klerosCore.address, veaInbox.address, foreignChainId, foreignGateway.address, dai.address],

contracts/deploy/03-vea-mock.ts

@@ -30,7 +30,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   console.log("Calculated future HomeGatewayToEthereum address for nonce %d: %s", nonce, homeGatewayAddress);
 
   const homeChainIdAsBytes32 = hexZeroPad(hexlify(HardhatChain.HARDHAT), 32);
-  const foreignGateway = await deployUpgradable(hre, "ForeignGatewayOnEthereum", {
+  const foreignGateway = await deployUpgradable(deployments, "ForeignGatewayOnEthereum", {
     from: deployer,
     contract: "ForeignGateway",
     args: [deployer, vea.address, homeChainIdAsBytes32, homeGatewayAddress],
@@ -39,7 +39,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   }); // nonce (implementation), nonce+1 (proxy)
   console.log("foreignGateway.address: ", foreignGateway.address);
 
-  await deployUpgradable(hre, "HomeGatewayToEthereum", {
+  await deployUpgradable(deployments, "HomeGatewayToEthereum", {
     from: deployer,
     contract: "HomeGateway",
     args: [
@@ -62,7 +62,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   await execute("ForeignGatewayOnEthereum", { from: deployer, log: true }, "changeCourtJurorFee", Courts.GENERAL, fee);
   // TODO: set up the correct fees for the lower courts
 
-  const disputeTemplateRegistry = await deployUpgradable(hre, "DisputeTemplateRegistry", {
+  const disputeTemplateRegistry = await deployUpgradable(deployments, "DisputeTemplateRegistry", {
     from: deployer,
     args: [deployer],
     log: true,

contracts/deploy/upgrade-kleros-core.ts

@@ -28,7 +28,7 @@ const deployUpgradeKlerosCore: DeployFunction = async (hre: HardhatRuntimeEnviro
     const sortitionModule = await deployments.get("SortitionModule");
 
     console.log("Upgrading the KlerosCore...");
-    await deployUpgradable(hre, "KlerosCore", {
+    await deployUpgradable(deployments, "KlerosCore", {
       from: deployer,
       args: [
         deployer,

contracts/deploy/upgrade-sortition-module.ts

@@ -24,7 +24,7 @@ const deployUpgradeSortitionModule: DeployFunction = async (hre: HardhatRuntimeE
     const klerosCoreAddress = klerosCore.address;
 
     console.log("Upgrading the SortitionModule...");
-    await deployUpgradable(hre, "SortitionModule", {
+    await deployUpgradable(deployments, "SortitionModule", {
       from: deployer,
       args: [
         deployer,