chore: deploy scripts

Anmol-Dhiman · Anmol-Dhiman · commit 9badc57259b1 · 2024-06-18T02:04:48.000+05:30
diff --git a/contracts/deploy/00-home-chain-arbitration-neo.ts b/contracts/deploy/00-home-chain-arbitration-neo.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { BigNumber, BigNumberish } from "ethers";
 import { getContractAddress } from "./utils/getContractAddress";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { changeCurrencyRate } from "./utils/klerosCoreHelper";
@@ -12,7 +11,7 @@ import { DisputeKitClassic, KlerosCoreNeo } from "../typechain-types";
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
   const { deploy, execute } = deployments;
-  const { AddressZero } = hre.ethers.constants;
+  const { ZeroAddress } = hre.ethers;
   const RNG_LOOKAHEAD = 20;
 
   // fallback to hardhat node signers on local network
@@ -44,7 +43,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const disputeKit = await deployUpgradable(deployments, "DisputeKitClassicNeo", {
     from: deployer,
     contract: "DisputeKitClassic",
-    args: [deployer, AddressZero],
+    args: [deployer, ZeroAddress],
     log: true,
   });
 
@@ -83,15 +82,15 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     args: [
       deployer,
       deployer,
-      pnk.address,
-      AddressZero,
+      pnk.target,
+      ZeroAddress,
       disputeKit.address,
       false,
       [minStake, alpha, feeForJuror, jurorsForCourtJump],
       [0, 0, 0, 10], // evidencePeriod, commitPeriod, votePeriod, appealPeriod
-      ethers.utils.hexlify(5), // Extra data for sortition module will return the default value of K
+      ethers.toBeHex(5), // Extra data for sortition module will return the default value of K
       sortitionModule.address,
-      nft.address,
+      nft.target,
     ],
     log: true,
   }); // nonce+2 (implementation), nonce+3 (proxy)
@@ -106,7 +105,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
 
   const core = (await hre.ethers.getContract("KlerosCoreNeo")) as KlerosCoreNeo;
   try {
-    await changeCurrencyRate(core, weth.address, true, 1, 1);
+    await changeCurrencyRate(core, await weth.getAddress(), true, 1, 1);
   } catch (e) {
     console.error("failed to change currency rates:", e);
   }
@@ -120,7 +119,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const resolver = await deploy("DisputeResolverNeo", {
     from: deployer,
     contract: "DisputeResolver",
-    args: [core.address, disputeTemplateRegistry.address],
+    args: [core.target, disputeTemplateRegistry.target],
     log: true,
   });
 
diff --git a/contracts/deploy/00-home-chain-arbitration-university.ts b/contracts/deploy/00-home-chain-arbitration-university.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { BigNumber, BigNumberish } from "ethers";
 import { getContractAddress } from "./utils/getContractAddress";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { changeCurrencyRate } from "./utils/klerosCoreHelper";
@@ -12,7 +11,7 @@ import { getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
   const { deploy } = deployments;
-  const { AddressZero } = hre.ethers.constants;
+  const { ZeroAddress } = hre.ethers;
 
   // fallback to hardhat node signers on local network
   const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
@@ -26,7 +25,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const disputeKit = await deployUpgradable(deployments, "DisputeKitClassicUniversity", {
     from: deployer,
     contract: "DisputeKitClassic",
-    args: [deployer, AddressZero],
+    args: [deployer, ZeroAddress],
     log: true,
   });
 
@@ -51,8 +50,8 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     args: [
       deployer, // governor
       deployer, // instructor
-      pnk.address,
-      AddressZero,
+      pnk.target,
+      ZeroAddress,
       disputeKit.address,
       false,
       [minStake, alpha, feeForJuror, jurorsForCourtJump],
@@ -72,9 +71,9 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
 
   const core = (await hre.ethers.getContract("KlerosCoreUniversity")) as KlerosCoreUniversity;
   try {
-    await changeCurrencyRate(core, pnk.address, true, 12225583, 12);
-    await changeCurrencyRate(core, dai.address, true, 60327783, 11);
-    await changeCurrencyRate(core, weth.address, true, 1, 1);
+    await changeCurrencyRate(core, await pnk.getAddress(), true, 12225583, 12);
+    await changeCurrencyRate(core, await dai.getAddress(), true, 60327783, 11);
+    await changeCurrencyRate(core, await weth.getAddress(), true, 1, 1);
   } catch (e) {
     console.error("failed to change currency rates:", e);
   }
@@ -88,7 +87,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   await deploy("DisputeResolverUniversity", {
     from: deployer,
     contract: "DisputeResolver",
-    args: [core.address, disputeTemplateRegistry.address],
+    args: [core.target, disputeTemplateRegistry.target],
     log: true,
   });
 };
diff --git a/contracts/deploy/00-home-chain-arbitration.ts b/contracts/deploy/00-home-chain-arbitration.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { BigNumber, BigNumberish } from "ethers";
 import { getContractAddress } from "./utils/getContractAddress";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { changeCurrencyRate } from "./utils/klerosCoreHelper";
@@ -11,7 +10,7 @@ import { DisputeKitClassic, KlerosCore } from "../typechain-types";
 
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
-  const { AddressZero } = hre.ethers.constants;
+  const { ZeroAddress } = hre.ethers;
   const RNG_LOOKAHEAD = 20;
 
   // fallback to hardhat node signers on local network
@@ -36,13 +35,13 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
 
   const rng = await deployUpgradable(deployments, "RandomizerRNG", {
     from: deployer,
-    args: [randomizerOracle.address, deployer],
+    args: [randomizerOracle.target, deployer],
     log: true,
   });
 
   const disputeKit = await deployUpgradable(deployments, "DisputeKitClassic", {
     from: deployer,
-    args: [deployer, AddressZero],
+    args: [deployer, ZeroAddress],
     log: true,
   });
 
@@ -70,13 +69,13 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     args: [
       deployer,
       deployer,
-      pnk.address,
-      AddressZero,
+      pnk.target,
+      ZeroAddress,
       disputeKit.address,
       false,
       [minStake, alpha, feeForJuror, jurorsForCourtJump],
       [0, 0, 0, 10], // evidencePeriod, commitPeriod, votePeriod, appealPeriod
-      ethers.utils.hexlify(5), // Extra data for sortition module will return the default value of K
+      ethers.toBeHex(5), // Extra data for sortition module will return the default value of K
       sortitionModule.address,
     ],
     log: true,
@@ -92,9 +91,9 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
 
   const core = (await hre.ethers.getContract("KlerosCore")) as KlerosCore;
   try {
-    await changeCurrencyRate(core, pnk.address, true, 12225583, 12);
-    await changeCurrencyRate(core, dai.address, true, 60327783, 11);
-    await changeCurrencyRate(core, weth.address, true, 1, 1);
+    await changeCurrencyRate(core, await pnk.getAddress(), true, 12225583, 12);
+    await changeCurrencyRate(core, await dai.getAddress(), true, 60327783, 11);
+    await changeCurrencyRate(core, await weth.getAddress(), true, 1, 1);
   } catch (e) {
     console.error("failed to change currency rates:", e);
   }
diff --git a/contracts/deploy/00-home-chain-pnk-faucet.ts b/contracts/deploy/00-home-chain-pnk-faucet.ts
@@ -8,7 +8,7 @@ const pnkByChain = new Map<HomeChains, string>([
 ]);
 
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
-  const { ethers, deployments, getNamedAccounts, getChainId } = hre;
+  const { deployments, getNamedAccounts, getChainId } = hre;
   const { deploy, execute } = deployments;
 
   // fallback to hardhat node signers on local network
@@ -24,12 +24,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       args: [pnkAddress],
       log: true,
     });
-    await execute(
-      "PNKFaucet",
-      { from: deployer, log: true },
-      "changeAmount",
-      hre.ethers.utils.parseUnits("10000", "ether")
-    );
+    await execute("PNKFaucet", { from: deployer, log: true }, "changeAmount", hre.ethers.parseUnits("10000", "ether"));
   }
 };
 
diff --git a/contracts/deploy/01-foreign-gateway-on-ethereum.ts b/contracts/deploy/01-foreign-gateway-on-ethereum.ts
@@ -7,8 +7,8 @@ import { deployUpgradable } from "./utils/deployUpgradable";
 
 const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId, config } = hre;
-  const { deploy, execute } = deployments;
-  const { hexZeroPad, hexlify } = ethers.utils;
+  const { execute } = deployments;
+  const { zeroPadValue, toBeHex } = ethers;
 
   // fallback to hardhat node signers on local network
   const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
@@ -19,7 +19,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   // TODO: use deterministic deployments
   const network = config.networks[hre.network.name];
   const homeNetwork = config.networks[network.companionNetworks.home] as HttpNetworkConfig;
-  const homeChainProvider = new ethers.providers.JsonRpcProvider(homeNetwork.url);
+  const homeChainProvider = new ethers.JsonRpcProvider(homeNetwork.url);
   let nonce = await homeChainProvider.getTransactionCount(deployer);
   nonce += 1; // HomeGatewayToEthereum Proxy deploy tx will be the 2nd tx after this on its home network, so we add 1 to the current nonce.
   const homeGatewayAddress = getContractAddress(deployer, nonce);
@@ -29,7 +29,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   console.log("using VeaOutboxArbToEthDevnet at %s", veaOutbox.address);
 
   const homeChainId = (await homeChainProvider.getNetwork()).chainId;
-  const homeChainIdAsBytes32 = hexZeroPad(hexlify(homeChainId), 32);
+  const homeChainIdAsBytes32 = zeroPadValue(toBeHex(homeChainId), 32);
   await deployUpgradable(deployments, "ForeignGatewayOnEthereum", {
     from: deployer,
     contract: "ForeignGateway",
diff --git a/contracts/deploy/01-foreign-gateway-on-gnosis.ts b/contracts/deploy/01-foreign-gateway-on-gnosis.ts
@@ -1,17 +1,18 @@
-import { parseUnits } from "ethers/lib/utils";
+import { parseUnits } from "ethers";
+import { BigNumber } from "@ethersproject/bignumber";
 import { HardhatRuntimeEnvironment, HttpNetworkConfig } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
 import { getContractAddress } from "./utils/getContractAddress";
 import { KlerosCore__factory } from "../typechain-types";
 import { Courts, ForeignChains, isSkipped } from "./utils";
 import { deployUpgradable } from "./utils/deployUpgradable";
 
-const ONE_GWEI = parseUnits("1", "gwei");
+const ONE_GWEI = BigNumber.from(parseUnits("1", "gwei"));
 
 const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId, config } = hre;
   const { deploy, execute } = deployments;
-  const { hexZeroPad, hexlify } = ethers.utils;
+  const { zeroPadValue, toBeHex } = ethers;
 
   // fallback to hardhat node signers on local network
   const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
@@ -22,7 +23,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   // TODO: use deterministic deployments
   const network = config.networks[hre.network.name];
   const homeNetwork = config.networks[network.companionNetworks.home] as HttpNetworkConfig;
-  const homeChainProvider = new ethers.providers.JsonRpcProvider(homeNetwork.url);
+  const homeChainProvider = new ethers.JsonRpcProvider(homeNetwork.url);
   let nonce = await homeChainProvider.getTransactionCount(deployer);
   nonce += 1; // HomeGatewayToEthereum Proxy deploy tx will be the 2nd tx after this on its home network, so we add 1 to the current nonce.
   const homeGatewayAddress = getContractAddress(deployer, nonce); // HomeGateway deploy tx will be the next tx home network
@@ -32,7 +33,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   console.log("using VeaOutboxArbToGnosisDevnet at %s", veaOutbox.address);
 
   const homeChainId = (await homeChainProvider.getNetwork()).chainId;
-  const homeChainIdAsBytes32 = hexZeroPad(hexlify(homeChainId), 32);
+  const homeChainIdAsBytes32 = zeroPadValue(toBeHex(homeChainId), 32);
   await deployUpgradable(deployments, "ForeignGatewayOnGnosis", {
     from: deployer,
     contract: "ForeignGateway",
diff --git a/contracts/deploy/02-home-gateway-to-ethereum.ts b/contracts/deploy/02-home-gateway-to-ethereum.ts
@@ -32,7 +32,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       veaInbox.address,
       foreignChainId,
       foreignGateway.address,
-      ethers.constants.AddressZero, // feeToken is ETH
+      ethers.ZeroAddress, // feeToken is ETH
     ],
     log: true,
   }); // nonce+0
diff --git a/contracts/deploy/03-vea-mock.ts b/contracts/deploy/03-vea-mock.ts
@@ -11,7 +11,7 @@ import { deployUpgradable } from "./utils/deployUpgradable";
 const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts } = hre;
   const { deploy, execute } = deployments;
-  const { hexZeroPad, hexlify } = ethers.utils;
+  const { zeroPadValue, toBeHex } = ethers;
 
   // fallback to hardhat node signers on local network
   const deployer = (await getNamedAccounts()).deployer ?? (await hre.ethers.getSigners())[0].address;
@@ -29,7 +29,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const homeGatewayAddress = getContractAddress(deployer, nonce);
   console.log("calculated future HomeGatewayToEthereum address for nonce %d: %s", nonce, homeGatewayAddress);
 
-  const homeChainIdAsBytes32 = hexZeroPad(hexlify(HardhatChain.HARDHAT), 32);
+  const homeChainIdAsBytes32 = zeroPadValue(toBeHex(HardhatChain.HARDHAT), 32);
   const foreignGateway = await deployUpgradable(deployments, "ForeignGatewayOnEthereum", {
     from: deployer,
     contract: "ForeignGateway",
@@ -48,7 +48,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       vea.address,
       HardhatChain.HARDHAT,
       foreignGateway.address,
-      ethers.constants.AddressZero, // feeToken
+      ethers.ZeroAddress, // feeToken
     ],
     gasLimit: 4000000,
     log: true,
@@ -80,7 +80,7 @@ const deployHomeGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       "disputeTemplateMapping: TODO",
       extraData,
       disputeTemplateRegistry.address,
-      ethers.constants.AddressZero,
+      ethers.ZeroAddress,
     ],
     log: true,
   });
diff --git a/contracts/deploy/04-foreign-arbitrable.ts b/contracts/deploy/04-foreign-arbitrable.ts
@@ -1,8 +1,9 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { parseUnits } from "ethers/lib/utils";
+import { parseUnits } from "ethers";
 import disputeTemplate from "../test/fixtures/DisputeTemplate.simple.json";
 import { ForeignChains, isSkipped } from "./utils";
+import { BigNumber } from "@ethersproject/bignumber";
 
 const foreignGatewayArtifactByChain = new Map<ForeignChains, string>([
   [ForeignChains.ETHEREUM_MAINNET, "ForeignGatewayOnEthereum"],
@@ -11,7 +12,7 @@ const foreignGatewayArtifactByChain = new Map<ForeignChains, string>([
   [ForeignChains.GNOSIS_CHIADO, "ForeignGatewayOnGnosis"],
 ]);
 
-const ONE_GWEI = parseUnits("1", "gwei");
+const ONE_GWEI = BigNumber.from(parseUnits("1", "gwei"));
 
 const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId, config } = hre;
@@ -22,7 +23,7 @@ const deployForeignGateway: DeployFunction = async (hre: HardhatRuntimeEnvironme
   const chainId = Number(await getChainId());
   console.log("deploying to chainId %s with deployer %s", chainId, deployer);
 
-  const foreignGatewayArtifact = foreignGatewayArtifactByChain.get(chainId) ?? ethers.constants.AddressZero;
+  const foreignGatewayArtifact = foreignGatewayArtifactByChain.get(chainId) ?? ethers.ZeroAddress;
   const foreignGateway = await deployments.get(foreignGatewayArtifact);
   console.log("using foreign gateway: %s", foreignGatewayArtifact);
 
diff --git a/contracts/deploy/04-klerosliquid-to-v2-gnosis.ts b/contracts/deploy/04-klerosliquid-to-v2-gnosis.ts
@@ -1,14 +1,15 @@
-import { parseUnits, parseEther } from "ethers/lib/utils";
+import { parseUnits, parseEther } from "ethers";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
 import disputeTemplate from "../test/fixtures/DisputeTemplate.simple.json";
 import { ForeignChains, isSkipped } from "./utils";
+import { BigNumber } from "@ethersproject/bignumber";
 
 const wrappedPNKByChain = new Map<ForeignChains, string>([
   [ForeignChains.GNOSIS_MAINNET, "0xcb3231aBA3b451343e0Fddfc45883c842f223846"],
 ]);
 
-const ONE_GWEI = parseUnits("1", "gwei");
+const ONE_GWEI = BigNumber.from(parseUnits("1", "gwei"));
 
 const deployKlerosLiquid: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
@@ -40,7 +41,7 @@ const deployKlerosLiquid: DeployFunction = async (hre: HardhatRuntimeEnvironment
   }
 
   const wPnkAddress = wrappedPNKByChain.get(ForeignChains[ForeignChains[chainId]]);
-  const rng = ethers.constants.AddressZero;
+  const rng = ethers.ZeroAddress;
   const minStakingTime = 99999999;
   const maxFreezingTime = 0;
   const minStake = parseEther("9999999");
diff --git a/contracts/deploy/05-arbitrable-dispute-template.ts b/contracts/deploy/05-arbitrable-dispute-template.ts
@@ -1,6 +1,7 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
 import { ArbitrableExample } from "../typechain-types";
+import { EventLog } from "ethers";
 
 const deployResolver: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
@@ -32,8 +33,8 @@ const deployResolver: DeployFunction = async (hre: HardhatRuntimeEnvironment) =>
 
   const arbitrable = (await ethers.getContract("ArbitrableExample")) as ArbitrableExample;
   let tx = await (await arbitrable.changeDisputeTemplate(template, "disputeTemplateMapping: TODO")).wait();
-  tx.events?.forEach((event) => {
-    console.log("event: %O", event.args);
+  tx?.logs?.forEach((event) => {
+    if (event instanceof EventLog) console.log("event: %O", event.args);
   });
 };
 
diff --git a/contracts/deploy/fix1148.ts b/contracts/deploy/fix1148.ts
diff --git a/contracts/deploy/upgrade-kleros-core.ts b/contracts/deploy/upgrade-kleros-core.ts
diff --git a/contracts/deploy/utils/deployTokens.ts b/contracts/deploy/utils/deployTokens.ts
diff --git a/contracts/src/arbitration/arbitrables/ArbitrableExample.sol b/contracts/src/arbitration/arbitrables/ArbitrableExample.sol
