fix: hardhat ethers versions bump, test fix

Author: jaybuidl

contracts/package.json

@@ -61,11 +61,11 @@
     "@kleros/kleros-v2-prettier-config": "workspace:^",
     "@kleros/kleros-v2-tsconfig": "workspace:^",
     "@logtail/pino": "^0.4.19",
-    "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
-    "@nomicfoundation/hardhat-ethers": "^3.0.0",
-    "@nomiclabs/hardhat-solhint": "^3.0.1",
-    "@openzeppelin/contracts": "^5.0.2",
-    "@typechain/ethers-v6": "^0.5.0",
+    "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
+    "@nomicfoundation/hardhat-ethers": "^3.0.8",
+    "@nomiclabs/hardhat-solhint": "^3.1.0",
+    "@openzeppelin/contracts": "^5.1.0",
+    "@typechain/ethers-v6": "^0.5.1",
     "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",
@@ -75,17 +75,17 @@
     "chai": "^4.4.1",
     "dotenv": "^16.3.1",
     "ethereumjs-util": "^7.1.5",
-    "ethers": "^6.10.0",
+    "ethers": "^6.13.4",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
-    "hardhat": "2.19.0",
+    "hardhat": "2.22.15",
     "hardhat-contract-sizer": "^2.10.0",
-    "hardhat-deploy": "^0.11.45",
-    "hardhat-deploy-ethers": "^0.4.1",
+    "hardhat-deploy": "^0.14.0",
+    "hardhat-deploy-ethers": "^0.4.2",
     "hardhat-deploy-tenderly": "^0.2.0",
     "hardhat-docgen": "^1.3.0",
-    "hardhat-gas-reporter": "^1.0.9",
-    "hardhat-tracer": "^2.7.0",
+    "hardhat-gas-reporter": "^1.0.10",
+    "hardhat-tracer": "^3.1.0",
     "hardhat-watcher": "^2.5.0",
     "node-fetch": "^3.3.2",
     "pino": "^8.17.2",

contracts/scripts/keeperBot.ts

@@ -192,7 +192,7 @@ const passPhase = async () => {
   }
   const before = getNumber(await sortition.phase());
   try {
-    const gas = ((await sortition.passPhase.estimateGas()) * toBigInt(150)) / toBigInt(100); // 50% extra gas
+    const gas = ((await sortition.passPhase.estimateGas()) * 150n) / 100n; // 50% extra gas
     const tx = await (await sortition.passPhase({ gasLimit: gas })).wait();
     logger.info(`passPhase txID: ${tx?.hash}`);
   } catch (e) {
@@ -221,7 +221,7 @@ const passPeriod = async (dispute: { id: string }) => {
   }
   const before = (await core.disputes(dispute.id)).period;
   try {
-    const gas = ((await core.passPeriod.estimateGas(dispute.id)) * toBigInt(150)) / toBigInt(100); // 50% extra gas
+    const gas = ((await core.passPeriod.estimateGas(dispute.id)) * 150n) / 100n; // 50% extra gas
     const tx = await (await core.passPeriod(dispute.id, { gasLimit: gas })).wait();
     logger.info(`passPeriod txID: ${tx?.hash}`);
   } catch (e) {
@@ -285,7 +285,7 @@ const executeRuling = async (dispute: { id: string }) => {
     return success;
   }
   try {
-    const gas = ((await core.executeRuling.estimateGas(dispute.id)) * toBigInt(150)) / toBigInt(100); // 50% extra gas
+    const gas = ((await core.executeRuling.estimateGas(dispute.id)) * 150n) / 100n; // 50% extra gas
     const tx = await (await core.executeRuling(dispute.id, { gasLimit: gas })).wait();
     logger.info(`ExecuteRuling txID: ${tx?.hash}`);
     success = true;
@@ -302,7 +302,7 @@ const withdrawAppealContribution = async (
 ): Promise<boolean> => {
   const { disputeKitClassic: kit } = await getContracts();
   let success = false;
-  let amountWithdrawn = toBigInt(0);
+  let amountWithdrawn = 0n;
   try {
     amountWithdrawn = await kit.withdrawFeesAndRewards.staticCall(
       disputeId,
@@ -316,7 +316,7 @@ const withdrawAppealContribution = async (
     );
     return success;
   }
-  if (amountWithdrawn === toBigInt(0)) {
+  if (amountWithdrawn === 0n) {
     logger.debug(
       `WithdrawFeesAndRewards: no fees or rewards to withdraw for dispute #${disputeId}, round #${roundId}, choice ${contribution.choice} and beneficiary ${contribution.contributor.id}, skipping`
     );
@@ -333,8 +333,8 @@ const withdrawAppealContribution = async (
         roundId,
         contribution.choice
       )) *
-        toBigInt(150)) /
-      toBigInt(100); // 50% extra gas
+        150n) /
+      100n; // 50% extra gas
     const tx = await (
       await kit.withdrawFeesAndRewards(disputeId, contribution.contributor.id, roundId, contribution.choice, {
         gasLimit: gas,
@@ -353,14 +353,14 @@ const executeDelayedStakes = async () => {
 
   // delayedStakes = 1 + delayedStakeWriteIndex - delayedStakeReadIndex
   const delayedStakesRemaining =
-    toBigInt(1) + (await sortition.delayedStakeWriteIndex()) - (await sortition.delayedStakeReadIndex());
+    1n + (await sortition.delayedStakeWriteIndex()) - (await sortition.delayedStakeReadIndex());
 
   const delayedStakes =
     delayedStakesRemaining < MAX_DELAYED_STAKES_ITERATIONS
       ? delayedStakesRemaining
       : toBigInt(MAX_DELAYED_STAKES_ITERATIONS);
 
-  if (delayedStakes === toBigInt(0)) {
+  if (delayedStakes === 0n) {
     logger.info("No delayed stakes to execute");
     return true;
   }
@@ -373,7 +373,7 @@ const executeDelayedStakes = async () => {
     return success;
   }
   try {
-    const gas = ((await sortition.executeDelayedStakes.estimateGas(delayedStakes)) * toBigInt(150)) / toBigInt(100); // 50% extra gas
+    const gas = ((await sortition.executeDelayedStakes.estimateGas(delayedStakes)) * 150n) / 100n; // 50% extra gas
     const tx = await (await sortition.executeDelayedStakes(delayedStakes, { gasLimit: gas })).wait();
     logger.info(`executeDelayedStakes txID: ${tx?.hash}`);
   } catch (e) {
@@ -389,7 +389,7 @@ const getMissingJurors = async (dispute: { id: string; currentRoundIndex: string
 };
 
 const isDisputeFullyDrawn = async (dispute: { id: string; currentRoundIndex: string }): Promise<boolean> => {
-  return (await getMissingJurors(dispute)) === toBigInt(0);
+  return (await getMissingJurors(dispute)) === 0n;
 };
 
 const getNumberOfMissingRepartitions = async (
@@ -398,7 +398,7 @@ const getNumberOfMissingRepartitions = async (
 ) => {
   const { core } = await getContracts();
   const { repartitions, drawnJurors } = await core.getRoundInfo(dispute.id, dispute.currentRoundIndex);
-  return coherentCount === toBigInt(0)
+  return coherentCount === 0n
     ? drawnJurors.length - getNumber(repartitions)
     : 2 * drawnJurors.length - getNumber(repartitions);
 };
@@ -545,7 +545,7 @@ async function main() {
           await delay(ITERATIONS_COOLDOWN_PERIOD); // To avoid spiking the gas price
           maxDrawingTimePassed = await hasMaxDrawingTimePassed();
           numberOfMissingJurors = await getMissingJurors(dispute);
-        } while (!(numberOfMissingJurors === toBigInt(0)) && !maxDrawingTimePassed);
+        } while (!(numberOfMissingJurors === 0n) && !maxDrawingTimePassed);
       }
       // At this point, either all disputes are fully drawn or max drawing time has passed
     }
@@ -589,7 +589,7 @@ async function main() {
 
   for (var dispute of unprocessedDisputesInExecution) {
     const { period } = await core.disputes(dispute.id);
-    if (period !== toBigInt(4)) {
+    if (period !== 4n) {
       logger.info(`Skipping dispute #${dispute.id} because it is not in the execution period`);
       continue;
     }
@@ -642,7 +642,7 @@ async function main() {
     contributions = [...new Set(contributions)];
     for (let contribution of contributions) {
       // Could be improved by pinpointing exactly which round requires a withdrawal, just try all of them for now.
-      for (let round = toBigInt(dispute.currentRoundIndex); round >= 0; round = round - toBigInt(1)) {
+      for (let round = toBigInt(dispute.currentRoundIndex); round >= 0; round = round - 1n) {
         await withdrawAppealContribution(dispute.id, round.toString(), contribution);
         await delay(ITERATIONS_COOLDOWN_PERIOD); // To avoid spiking the gas price
       }

contracts/test/arbitration/draw.ts

@@ -139,7 +139,7 @@ describe("Draw Benchmark", async () => {
     });
     if (tx.blockNumber === null) throw new Error("tx.blockNumber is null");
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
-    const [disputeId] = abiCoder.decode(["uint"], `0x${trace.returnValue}`);
+    const [disputeId] = abiCoder.decode(["uint"], ethers.getBytes(`${trace.returnValue}`));
     const lastBlock = await ethers.provider.getBlock(tx.blockNumber - 1);
     if (lastBlock?.hash === null || lastBlock?.hash === undefined) throw new Error("lastBlock is null || undefined");
     // Relayer tx

contracts/test/integration/index.ts

@@ -107,7 +107,7 @@ describe("Integration tests", async () => {
     });
 
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
-    const [disputeId] = abiCoder.decode(["uint"], `0x${trace.returnValue}`); // get returned value from createDispute()
+    const [disputeId] = abiCoder.decode(["uint"], ethers.getBytes(`${trace.returnValue}`)); // get returned value from createDispute()
     console.log("Dispute Created with disputeId: %d", disputeId);
     await expect(tx)
       .to.emit(foreignGateway, "CrossChainDisputeOutgoing")

contracts/test/rng/index.ts

@@ -33,14 +33,14 @@ describe("BlockHashRNG", async () => {
   it("Should return a non-zero number for a block number in the past", async () => {
     const tx = await rng.receiveRandomness(9876543210);
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
-    const [rn] = abiCoder.decode(["uint"], `0x${trace.returnValue}`);
+    const [rn] = abiCoder.decode(["uint"], ethers.getBytes(`${trace.returnValue}`));
     expect(rn).to.equal(0);
   });
 
   it("Should return zero for a block number in the future", async () => {
     const tx = await rng.receiveRandomness(5);
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
-    const [rn] = abiCoder.decode(["uint"], `0x${trace.returnValue}`);
+    const [rn] = abiCoder.decode(["uint"], ethers.getBytes(`${trace.returnValue}`));
     expect(rn).to.not.equal(0);
   });
 });

kleros-sdk/package.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@kleros/kleros-v2-contracts": "workspace:^",
-    "@reality.eth/reality-eth-lib": "^3.2.30",
+    "@reality.eth/reality-eth-lib": "^3.2.44",
     "mustache": "^4.2.0",
     "zod": "^3.22.4"
   }