fix: failing test, removed unnecessary/outdated deps like ethers-waffle

Author: jaybuidl

contracts/.npmrc

@@ -0,0 +1 @@
+sign-git-tag=true

contracts/hardhat.config.ts

@@ -1,7 +1,7 @@
 /* eslint-disable node/no-missing-require */
 import * as dotenv from "dotenv";
 import { HardhatUserConfig } from "hardhat/config";
-import "@nomiclabs/hardhat-waffle";
+import "@nomicfoundation/hardhat-chai-matchers";
 import "@typechain/hardhat";
 import "hardhat-deploy-tenderly";
 import "hardhat-gas-reporter";
@@ -80,11 +80,11 @@ const config: HardhatUserConfig = {
       chainId: 421613,
       url: "https://goerli-rollup.arbitrum.io/rpc",
       accounts: [
-        process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_1 as string,
-        process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_2 as string,
-        process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_3 as string,
-        process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_4 as string,
-        process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_5 as string,
+        (process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_1 as string) || "",
+        (process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_2 as string) || "",
+        (process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_3 as string) || "",
+        (process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_4 as string) || "",
+        (process.env.ARB_GOERLI_PRIVATE_KEY_WALLET_5 as string) || "",
       ],
       live: true,
       saveDeployments: true,

contracts/package.json

@@ -35,8 +35,7 @@
   },
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
-    "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@0.3.0-beta.13",
-    "@nomiclabs/hardhat-waffle": "^2.0.5",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@openzeppelin/contracts": "^4.8.2",
     "@typechain/ethers-v5": "^10.2.0",
     "@typechain/hardhat": "^6.1.5",
@@ -46,15 +45,13 @@
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
     "chai": "^4.3.7",
-    "chai-ethers": "^0.0.1",
     "dotenv": "^16.0.3",
-    "ethereum-waffle": "^3.4.4",
     "ethereumjs-util": "^7.1.5",
     "ethers": "^5.7.2",
     "hardhat": "^2.13.1",
     "hardhat-contract-sizer": "^2.8.0",
     "hardhat-deploy": "^0.11.26",
-    "hardhat-deploy-ethers": "^0.3.0-beta.13",
+    "hardhat-deploy-ethers": "^0.4.0-next.1",
     "hardhat-deploy-tenderly": "^0.2.0",
     "hardhat-docgen": "^1.3.0",
     "hardhat-gas-reporter": "^1.0.9",

contracts/test/chai-setup.ts

@@ -1,11 +1,8 @@
-import { use, expect } from "chai";
+import { expect } from "chai";
 import { ethers } from "hardhat";
 import { BigNumber } from "ethers";
-import { solidity } from "ethereum-waffle";
 const hre = require("hardhat");
 
-use(solidity);
-
 const Party = {
   None: 0,
   Submitter: 1,

contracts/test/evidence/index.ts

@@ -164,6 +164,10 @@ describe("Integration tests", async () => {
     expect((await core.disputes(0)).period).to.equal(Period.vote);
     await disputeKit.connect(await ethers.getSigner(deployer)).castVote(0, [0, 1, 2], 0, 0, "");
     await core.passPeriod(0);
+
+    await network.provider.send("evm_increaseTime", [100]); // Wait for the appeal period
+    await network.provider.send("evm_mine");
+
     await core.passPeriod(0);
     expect((await core.disputes(0)).period).to.equal(Period.execution);
     expect(await core.execute(0, 0, 1000)).to.emit(core, "TokenAndETHShift");
@@ -174,7 +178,7 @@ describe("Integration tests", async () => {
     expect(tx4).to.emit(arbitrable, "Ruling").withArgs(foreignGateway.address, 1, 0); // The ForeignGateway starts counting disputeID from 1.
   });
 
-  async function mineBlocks(n) {
+  async function mineBlocks(n: number) {
     for (let index = 0; index < n; index++) {
       await network.provider.send("evm_mine");
     }