fix: mostly minor

Author: jaybuidl

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

@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { BigNumberish, toBigInt } from "ethers";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { HomeChains, isSkipped } from "./utils";
 import { deployERC20AndFaucet } from "./utils/deployTokens";

contracts/deploy/upgrade-kleros-core.ts

@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { toBigInt } from "ethers";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { HomeChains, isSkipped } from "./utils";
 
@@ -16,9 +15,9 @@ const deployUpgradeKlerosCore: DeployFunction = async (hre: HardhatRuntimeEnviro
   try {
     const pnk = await deployments.get("PNK");
     const disputeKit = await deployments.get("DisputeKitClassic");
-    const minStake = toBigInt(10) ** toBigInt(20) * toBigInt(2);
+    const minStake = 2n * 10n ** 20n;
     const alpha = 10000;
-    const feeForJuror = toBigInt(10) * toBigInt(17);
+    const feeForJuror = 10n * 17n;
     const sortitionModule = await deployments.get("SortitionModule");
 
     console.log("upgrading the KlerosCore...");

contracts/deploy/utils/deployTokens.ts

@@ -1,6 +1,5 @@
 import { Contract } from "ethers";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
-import { toBigInt } from "ethers";
 import { getContractOrDeploy } from "./getContractOrDeploy";
 import { isMainnet } from ".";
 
@@ -46,7 +45,7 @@ export const deployFaucet = async (
 
   const faucetBalance = await erc20.balanceOf(faucet.target);
   const deployerBalance = await erc20.balanceOf(deployer);
-  if (deployerBalance >= faucetFundingAmount && faucetBalance < faucetFundingAmount / toBigInt(5)) {
+  if (deployerBalance >= faucetFundingAmount && faucetBalance < faucetFundingAmount / 5n) {
     // Fund the faucet if deployer has enough tokens and if the faucet has less than 20% of the faucetFundingAmount
     console.log(`funding ${ticker}Faucet with ${faucetFundingAmount}`);
     await erc20.transfer(faucet.target, faucetFundingAmount);

contracts/package.json

@@ -67,7 +67,7 @@
     "@logtail/pino": "^0.4.22",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
     "@nomicfoundation/hardhat-ethers": "^3.0.8",
-    "@nomiclabs/hardhat-solhint": "^3.1.0",
+    "@nomiclabs/hardhat-solhint": "^4.0.1",
     "@openzeppelin/contracts": "^5.1.0",
     "@typechain/ethers-v6": "^0.5.1",
     "@typechain/hardhat": "^9.1.0",
@@ -88,15 +88,15 @@
     "hardhat-deploy-ethers": "^0.4.2",
     "hardhat-deploy-tenderly": "^0.2.0",
     "hardhat-docgen": "^1.3.0",
-    "hardhat-gas-reporter": "^1.0.10",
+    "hardhat-gas-reporter": "^2.2.1",
     "hardhat-tracer": "^3.1.0",
     "hardhat-watcher": "^2.5.0",
     "node-fetch": "^3.3.2",
     "pino": "^8.21.0",
     "pino-pretty": "^10.3.1",
     "shelljs": "^0.8.5",
     "solhint-plugin-prettier": "^0.1.0",
-    "solidity-coverage": "^0.8.12",
+    "solidity-coverage": "^0.8.13",
     "ts-node": "^10.9.2",
     "typechain": "^8.3.2",
     "typescript": "^5.3.3"

contracts/scripts/populateCourts.ts

@@ -38,9 +38,9 @@ type Court = {
   supportedDisputeKits?: BigNumberish[];
 };
 
-const ETH_USD = toBigInt(4000);
-const DISPUTE_KIT_CLASSIC = toBigInt(1);
-const TEN_THOUSAND_GWEI = toBigInt(10) ** toBigInt(13);
+const ETH_USD = 4000n;
+const DISPUTE_KIT_CLASSIC = 1n;
+const TEN_THOUSAND_GWEI = 10n ** 13n;
 
 task("populate:courts", "Populates the courts and their parameters")
   .addOptionalParam(
@@ -94,17 +94,17 @@ task("populate:courts", "Populates the courts and their parameters")
     }
     console.log("Using core type %s", Cores[coreType]);
 
-    const truncateWei = (x: bigint) => (x / toBigInt(TEN_THOUSAND_GWEI)) * toBigInt(TEN_THOUSAND_GWEI);
+    const truncateWei = (x: bigint) => (x / TEN_THOUSAND_GWEI) * TEN_THOUSAND_GWEI;
 
     const parametersUsdToEth = (court: Court): Court => ({
       ...court,
-      minStake: truncateWei(toBigInt(court.minStake) / toBigInt(ETH_USD)),
-      feeForJuror: truncateWei(toBigInt(court.feeForJuror) / toBigInt(ETH_USD)),
+      minStake: truncateWei(toBigInt(court.minStake) / ETH_USD),
+      feeForJuror: truncateWei(toBigInt(court.feeForJuror) / ETH_USD),
     });
 
     const parametersProductionToDev = (court: Court): Court => ({
       ...court,
-      minStake: truncateWei(toBigInt(court.minStake) / toBigInt(10000)),
+      minStake: truncateWei(toBigInt(court.minStake) / 10000n),
       feeForJuror: truncateWei(ethers.parseEther("0.00001")),
       timesPerPeriod: [120, 120, 120, 240],
     });
@@ -183,17 +183,17 @@ task("populate:courts", "Populates the courts and their parameters")
           );
         }
 
-        if (!courtPresent.minStake === court.minStake) {
+        if (courtPresent.minStake !== court.minStake) {
           change = true;
           console.log("Court %d: changing minStake from %d to %d", court.id, courtPresent.minStake, court.minStake);
         }
 
-        if (!courtPresent.alpha === court.alpha) {
+        if (courtPresent.alpha !== court.alpha) {
           change = true;
           console.log("Court %d: changing alpha from %d to %d", court.id, courtPresent.alpha, court.alpha);
         }
 
-        if (!courtPresent.feeForJuror === court.feeForJuror) {
+        if (courtPresent.feeForJuror !== court.feeForJuror) {
           change = true;
           console.log(
             "Court %d: changing feeForJuror from %d to %d",
@@ -203,7 +203,7 @@ task("populate:courts", "Populates the courts and their parameters")
           );
         }
 
-        if (!courtPresent.jurorsForCourtJump === court.jurorsForCourtJump) {
+        if (courtPresent.jurorsForCourtJump !== court.jurorsForCourtJump) {
           change = true;
           console.log(
             "Court %d: changing jurorsForCourtJump from %d to %d",
@@ -228,15 +228,14 @@ task("populate:courts", "Populates the courts and their parameters")
           console.log("Court %d: no parameter change", court.id);
           continue;
         }
-
         await core.changeCourtParameters(
           court.id,
           court.hiddenVotes,
           court.minStake,
           court.alpha,
           court.feeForJuror,
           court.jurorsForCourtJump,
-          court.timesPerPeriod
+          [court.timesPerPeriod[0], court.timesPerPeriod[1], court.timesPerPeriod[2], court.timesPerPeriod[3]]
         );
       } else {
         console.log("Court %d not found, creating it with", court.id, court);

contracts/scripts/simulations/tasks.ts

@@ -77,11 +77,11 @@ task("simulate:create-court", "callable by Governor only. Create a new Court")
 
     const { wallet } = await getWallet(hre, walletindex);
 
-    const parent = toBigInt(1);
-    const minStake = toBigInt(10) ** toBigInt(20) * toBigInt(2);
-    const alpha = toBigInt(10000);
-    const feeForJuror = toBigInt(10) ** toBigInt(17);
-    const jurorsForCourtJump = toBigInt(3);
+    const parent = 1n;
+    const minStake = 2n * 10n ** 20n;
+    const alpha = 10000n;
+    const feeForJuror = 10n * 17n;
+    const jurorsForCourtJump = 3n;
     const hiddenVotes = false as boolean;
     const timesPerPeriod = [300, 300, 300, 300] as [BigNumberish, BigNumberish, BigNumberish, BigNumberish];
     const sortitionSumTreeK = ethers.toBeHex(3);
@@ -338,7 +338,7 @@ task("simulate:execute-ruling", "Executes the ruling for a dispute on KlerosCore
       console.log("txID execute: %s", executeTx?.hash);
 
       executeRulingTx = await (await connectedKlerosCore.executeRuling(disputeid)).wait(); // rule
-      console.log("txID executeRuling: %s", executeRulingTx?.transactionHash);
+      console.log("txID executeRuling: %s", executeRulingTx?.hash);
     } catch (e) {
       handleError(e);
     } finally {

contracts/scripts/simulations/utils.ts

@@ -151,7 +151,7 @@ export const waitForPeriod = async (disputeId: number, period: Period, hre) => {
   const { lastPeriodChange, courtID } = await core.disputes(disputeId);
   const periodDuration = (await core.getTimesPerPeriod(courtID))[period];
   const now = await latest(hre.network);
-  const remainingDuration = ethers.getNumber(lastPeriodChange + toBigInt(periodDuration) - toBigInt(now));
+  const remainingDuration = ethers.getNumber(lastPeriodChange + periodDuration - toBigInt(now));
   if (remainingDuration > 0) {
     await waitFor(remainingDuration, hre);
   }

contracts/test/arbitration/draw.ts

@@ -17,8 +17,8 @@ import { Courts } from "../../deploy/utils";
 /* eslint-disable no-unused-expressions */ // https://github.com/standard/standard/issues/690#issuecomment-278533482
 
 describe("Draw Benchmark", async () => {
-  const ONE_TENTH_ETH = toBigInt(10) ** toBigInt(17);
-  const ONE_THOUSAND_PNK = toBigInt(10) ** toBigInt(21);
+  const ONE_TENTH_ETH = 10n ** 17n;
+  const ONE_THOUSAND_PNK = 10n ** 21n;
 
   const enum Period {
     evidence, // Evidence can be submitted. This is also when drawing has to take place.
@@ -39,8 +39,8 @@ describe("Draw Benchmark", async () => {
     drawing, // Jurors can be drawn.
   }
 
-  let deployer;
-  let relayer;
+  let deployer: string;
+  let relayer: string;
   let disputeKit: DisputeKitClassic;
   let pnk: PNK;
   let core: KlerosCore;
@@ -50,7 +50,7 @@ describe("Draw Benchmark", async () => {
   let rng: IncrementalNG;
   let parentCourtMinStake: bigint;
   let childCourtMinStake: bigint;
-  const RANDOM = toBigInt("61688911660239508166491237672720926005752254046266901728404745669596507231249");
+  const RANDOM = 61688911660239508166491237672720926005752254046266901728404745669596507231249n;
   const PARENT_COURT = 1;
   const CHILD_COURT = 2;
   const abiCoder = ethers.AbiCoder.defaultAbiCoder();
@@ -71,7 +71,7 @@ describe("Draw Benchmark", async () => {
 
     parentCourtMinStake = await core.courts(Courts.GENERAL).then((court) => court.minStake);
 
-    childCourtMinStake = toBigInt(10) ** toBigInt(20) * toBigInt(3); // 300 PNK
+    childCourtMinStake = 3n * 10n ** 20n; // 300 PNK
 
     // Make the tests more deterministic with this dummy RNG
     await deployments.deploy("IncrementalNG", {
@@ -84,9 +84,9 @@ describe("Draw Benchmark", async () => {
     await sortitionModule.changeRandomNumberGenerator(rng.target, 20);
 
     // CourtId 2 = CHILD_COURT
-    const minStake = toBigInt(10) ** toBigInt(20) * toBigInt(3); // 300 PNK
-    const alpha = 10000;
-    const feeForJuror = toBigInt(10) ** toBigInt(17);
+    const minStake = 3n * 10n ** 20n; // 300 PNK
+    const alpha = 10000n;
+    const feeForJuror = 10n * 17n;
     await core.createCourt(
       1,
       false,
@@ -110,7 +110,7 @@ describe("Draw Benchmark", async () => {
     expectFromDraw: ExpectFromDraw,
     unstake: SetStake
   ) => {
-    const arbitrationCost = ONE_TENTH_ETH * toBigInt(3);
+    const arbitrationCost = ONE_TENTH_ETH * 3n;
     const [bridger] = await ethers.getSigners();
     const wallets: HDNodeWallet[] = [];
 
@@ -125,10 +125,10 @@ describe("Draw Benchmark", async () => {
       });
       expect(await ethers.provider.getBalance(wallet)).to.equal(ethers.parseEther("10"));
 
-      await pnk.transfer(wallet.address, ONE_THOUSAND_PNK * toBigInt(10));
-      expect(await pnk.balanceOf(wallet.address)).to.equal(ONE_THOUSAND_PNK * toBigInt(10));
+      await pnk.transfer(wallet.address, ONE_THOUSAND_PNK * 10n);
+      expect(await pnk.balanceOf(wallet.address)).to.equal(ONE_THOUSAND_PNK * 10n);
 
-      await pnk.connect(wallet).approve(core.target, ONE_THOUSAND_PNK * toBigInt(10), { gasLimit: 300000 });
+      await pnk.connect(wallet).approve(core.target, ONE_THOUSAND_PNK * 10n, { gasLimit: 300000 });
 
       await stake(wallet);
     }
@@ -147,7 +147,7 @@ describe("Draw Benchmark", async () => {
       .connect(await ethers.getSigner(relayer))
       ["relayCreateDispute((bytes32,uint256,address,uint256,uint256,uint256,string,uint256,bytes))"](
         {
-          foreignBlockHash: ethers.toBeHex(lastBlock?.hash),
+          foreignBlockHash: lastBlock?.hash,
           foreignChainID: 31337,
           foreignArbitrable: arbitrable.target,
           foreignDisputeID: disputeId,
@@ -193,12 +193,12 @@ describe("Draw Benchmark", async () => {
 
   it("Stakes in parent court and should draw jurors in parent court", async () => {
     const stake = async (wallet: HDNodeWallet) => {
-      await core.connect(wallet).setStake(PARENT_COURT, ONE_THOUSAND_PNK * toBigInt(5), { gasLimit: 5000000 });
+      await core.connect(wallet).setStake(PARENT_COURT, ONE_THOUSAND_PNK * 5n, { gasLimit: 5000000 });
 
       expect(await sortitionModule.getJurorBalance(wallet.address, 1)).to.deep.equal([
-        ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
-        0, // totalLocked
-        ONE_THOUSAND_PNK * toBigInt(5), // stakedInCourt
+        ONE_THOUSAND_PNK * 5n, // totalStaked
+        0n, // totalLocked
+        ONE_THOUSAND_PNK * 5n, // stakedInCourt
         PARENT_COURT, // nbOfCourts
       ]);
     };
@@ -219,15 +219,15 @@ describe("Draw Benchmark", async () => {
       countedDraws = await countDraws(tx.blockNumber);
       for (const [address, draws] of Object.entries(countedDraws)) {
         expect(await sortitionModule.getJurorBalance(address, PARENT_COURT)).to.deep.equal([
-          ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
+          ONE_THOUSAND_PNK * 5n, // totalStaked
           parentCourtMinStake * toBigInt(draws), // totalLocked
-          ONE_THOUSAND_PNK * toBigInt(5), // stakedInCourt
+          ONE_THOUSAND_PNK * 5n, // stakedInCourt
           1, // nbOfCourts
         ]);
         expect(await sortitionModule.getJurorBalance(address, CHILD_COURT)).to.deep.equal([
-          ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
+          ONE_THOUSAND_PNK * 5n, // totalStaked
           parentCourtMinStake * toBigInt(draws), // totalLocked
-          0, // stakedInCourt
+          0n, // stakedInCourt
           1, // nbOfCourts
         ]);
       }
@@ -262,7 +262,7 @@ describe("Draw Benchmark", async () => {
   // Warning: we are skipping this during `hardhat coverage` because it fails, although it passes with `hardhat test`
   it("Stakes in parent court and should draw nobody in subcourt [ @skip-on-coverage ]", async () => {
     const stake = async (wallet: HDNodeWallet) => {
-      await core.connect(wallet).setStake(PARENT_COURT, ONE_THOUSAND_PNK * toBigInt(5), { gasLimit: 5000000 });
+      await core.connect(wallet).setStake(PARENT_COURT, ONE_THOUSAND_PNK * 5n, { gasLimit: 5000000 });
     };
 
     const expectFromDraw = async (drawTx: Promise<ContractTransactionResponse>) => {
@@ -298,7 +298,7 @@ describe("Draw Benchmark", async () => {
 
   it("Stakes in subcourt and should draw jurors in parent court", async () => {
     const stake = async (wallet: HDNodeWallet) => {
-      await core.connect(wallet).setStake(CHILD_COURT, ONE_THOUSAND_PNK * toBigInt(5), { gasLimit: 5000000 });
+      await core.connect(wallet).setStake(CHILD_COURT, ONE_THOUSAND_PNK * 5n, { gasLimit: 5000000 });
     };
     let countedDraws: CountedDraws;
     const expectFromDraw = async (drawTx: Promise<ContractTransactionResponse>) => {
@@ -318,15 +318,15 @@ describe("Draw Benchmark", async () => {
       countedDraws = await countDraws(tx.blockNumber);
       for (const [address, draws] of Object.entries(countedDraws)) {
         expect(await sortitionModule.getJurorBalance(address, PARENT_COURT)).to.deep.equal([
-          ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
+          ONE_THOUSAND_PNK * 5n, // totalStaked
           parentCourtMinStake * toBigInt(draws), // totalLocked
           0, // stakedInCourt
           1, // nbOfCourts
         ]);
         expect(await sortitionModule.getJurorBalance(address, CHILD_COURT)).to.deep.equal([
-          ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
+          ONE_THOUSAND_PNK * 5n, // totalStaked
           parentCourtMinStake * toBigInt(draws), // totalLocked
-          ONE_THOUSAND_PNK * toBigInt(5), // stakedInCourt
+          ONE_THOUSAND_PNK * 5n, // stakedInCourt
           1, // nbOfCourts
         ]);
       }
@@ -360,7 +360,7 @@ describe("Draw Benchmark", async () => {
 
   it("Stakes in subcourt and should draw jurors in subcourt", async () => {
     const stake = async (wallet: HDNodeWallet) => {
-      await core.connect(wallet).setStake(CHILD_COURT, ONE_THOUSAND_PNK * toBigInt(5), { gasLimit: 5000000 });
+      await core.connect(wallet).setStake(CHILD_COURT, ONE_THOUSAND_PNK * 5n, { gasLimit: 5000000 });
     };
     let countedDraws: CountedDraws;
     const expectFromDraw = async (drawTx: Promise<ContractTransactionResponse>) => {
@@ -380,15 +380,15 @@ describe("Draw Benchmark", async () => {
       countedDraws = await countDraws(tx.blockNumber);
       for (const [address, draws] of Object.entries(countedDraws)) {
         expect(await sortitionModule.getJurorBalance(address, PARENT_COURT)).to.deep.equal([
-          ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
+          ONE_THOUSAND_PNK * 5n, // totalStaked
           childCourtMinStake * toBigInt(draws), // totalLocked
-          0, // stakedInCourt
+          0n, // stakedInCourt
           1, // nbOfCourts
         ]);
         expect(await sortitionModule.getJurorBalance(address, CHILD_COURT)).to.deep.equal([
-          ONE_THOUSAND_PNK * toBigInt(5), // totalStaked
+          ONE_THOUSAND_PNK * 5n, // totalStaked
           childCourtMinStake * toBigInt(draws), // totalLocked
-          ONE_THOUSAND_PNK * toBigInt(5), // stakedInCourt
+          ONE_THOUSAND_PNK * 5n, // stakedInCourt
           1, // nbOfCourts
         ]);
       }