fix: lockfile

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile --non-interactive
 
       - name: Compile contracts
         run: npx hardhat compile

hardhat.config.ts

@@ -1,5 +1,4 @@
 import * as dotenv from "dotenv";
-
 import type { HardhatUserConfig } from "hardhat/config";
 import "hardhat-preprocessor";
 import "@nomicfoundation/hardhat-toolbox";

package.json

@@ -35,11 +35,11 @@
     "@types/chai": "^4.2.0",
     "@types/mocha": ">=9.1.0",
     "@types/node": ">=16.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
     "chai": "^4.2.0",
     "chain": "^0.4.0",
-    "eslint": "^8.50.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.1",
     "ethers": "^6.7.1",
@@ -55,7 +55,7 @@
     "ts-node": ">=8.0.0",
     "tslint-config-prettier": "^1.18.0",
     "typechain": "^8.1.0",
-    "typescript": ">=4.5.0"
+    "typescript": "5.3.3"
   },
   "dependencies": {
     "dotenv": "^16.4.1"

scripts/migrations/01_deployCoreContracts.ts

@@ -1,6 +1,6 @@
 import { ethers } from "hardhat";
-import type { DeployFunction } from "hardhat-deploy/dist/types";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+import type { DeployFunction } from "hardhat-deploy/dist/types";
 
 import { generateAccessControlFuncSignatures, verifyContract } from "../utils";
 

scripts/migrations/02_deployHandlers.ts

@@ -1,5 +1,6 @@
-import type { DeployFunction } from "hardhat-deploy/dist/types";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+import type { DeployFunction } from "hardhat-deploy/dist/types";
+
 import { verifyContract } from "../utils";
 
 const deployFunc: DeployFunction = async function ({

scripts/utils.ts

@@ -1,8 +1,9 @@
 import fs from "fs";
 import { resolve } from "path";
-import { deployments, run } from "hardhat";
+
 import { keccak256, ContractFactory } from "ethers";
 import type { InterfaceAbi, Fragment } from "ethers";
+import { deployments, run } from "hardhat";
 import type { DeployResult } from "hardhat-deploy/dist/types";
 
 export function generateAccessControlFuncSignatures(contracts: Array<string>): {

test/contractBridge/admin.test.ts

@@ -1,14 +1,10 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
-import {
-  deployBridgeContracts,
-  createResourceID,
-  createERCWithdrawData,
-} from "../helpers";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
+
 import type {
   Bridge,
   Router,
@@ -18,6 +14,11 @@ import type {
   ERC20PresetMinterPauser__factory,
   Executor,
 } from "../../typechain-types";
+import {
+  deployBridgeContracts,
+  createResourceID,
+  createERCWithdrawData,
+} from "../helpers";
 
 // This test does NOT include all getter methods, just
 // getters that should work with only the constructor called

test/contractBridge/constructor.test.ts

@@ -1,8 +1,8 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
 import { expect } from "chai";
+import { ethers } from "hardhat";
 
 describe("Bridge/Router/Executor - [constructor]", () => {
   const domainID = 1;

test/contractBridge/depositERC20.test.ts

@@ -4,9 +4,10 @@
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
 import { assert, expect } from "chai";
 import { ethers } from "hardhat";
+
 import type {
   Bridge,
-  Depositor,
+  Router,
   ERC20Handler,
   ERC20PresetMinterPauser,
   ERC20Safe__factory,
@@ -31,7 +32,7 @@ describe("Bridge - [deposit - ERC20]", () => {
   const routerAddress = "0x1a60efB48c61A79515B170CA61C84DD6dCA80418";
 
   let bridgeInstance: Bridge;
-  let routerInstance: Depositor;
+  let routerInstance: Router;
   let executorInstance: Executor;
   let ERC20MintableInstance1: ERC20PresetMinterPauser;
   let ERC20MintableInstance2: ERC20PresetMinterPauser;

test/contractBridge/executeProposalERC20.test.ts

@@ -1,12 +1,9 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
-import { deployBridgeContracts, createERCDepositData } from "../helpers";
-
-import { accountProof1, storageProof1 } from "../testingProofs";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
 
 import type {
   Bridge,
@@ -17,6 +14,8 @@ import type {
   StateRootStorage,
   MerkleTrie__factory,
 } from "../../typechain-types";
+import { deployBridgeContracts, createERCDepositData } from "../helpers";
+import { accountProof1, storageProof1 } from "../testingProofs";
 
 describe("Bridge - [execute proposal - ERC20]", () => {
   const originDomainID = 1;

test/contractBridge/executeProposals.test.ts

@@ -1,11 +1,9 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
-import { deployBridgeContracts, createERCDepositData } from "../helpers";
-import { accountProof1, storageProof1 } from "../testingProofs";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
 
 import type {
   Bridge,
@@ -15,6 +13,8 @@ import type {
   ERC20PresetMinterPauser,
   StateRootStorage,
 } from "../../typechain-types";
+import { deployBridgeContracts, createERCDepositData } from "../helpers";
+import { accountProof1, storageProof1 } from "../testingProofs";
 
 describe("Bridge - [execute proposals]", () => {
   const originDomainID = 1;
@@ -145,6 +145,7 @@ describe("Bridge - [execute proposals]", () => {
     await expect(executeTx).not.to.be.reverted;
 
     // check that deposit nonces had been marked as used in bitmap
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     expectedDepositNonces.map(async (_, index) => {
       assert.isTrue(
         await executorInstance.isProposalExecuted(
@@ -184,6 +185,7 @@ describe("Bridge - [execute proposals]", () => {
     await expect(executeTx).not.to.be.reverted;
 
     // check that deposit nonces had been marked as used in bitmap
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     expectedDepositNonces.map(async (_, index) => {
       assert.isTrue(
         await executorInstance.isProposalExecuted(
@@ -252,6 +254,7 @@ describe("Bridge - [execute proposals]", () => {
       );
 
     // check that deposit nonces had been marked as used in bitmap
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     expectedDepositNonces.map(async (_, index) => {
       assert.isTrue(
         await executorInstance.isProposalExecuted(

test/e2e/erc20/decimals/bothChainsNot18Decimals.test.ts

@@ -1,9 +1,18 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
+
+import type {
+  StateRootStorage,
+  Bridge,
+  ERC20Handler,
+  ERC20PresetMinterPauser,
+  Executor,
+  Router,
+} from "../../../../typechain-types";
 import {
   deployBridgeContracts,
   createERCDepositData,
@@ -16,15 +25,6 @@ import {
   storageProof4,
 } from "../../../testingProofs";
 
-import type {
-  StateRootStorage,
-  Bridge,
-  ERC20Handler,
-  ERC20PresetMinterPauser,
-  Executor,
-  Router,
-} from "../../../../typechain-types";
-
 describe("E2E ERC20 - Two EVM Chains both with decimal places != 18", () => {
   const originDomainID = 1;
   const destinationDomainID = 2;

test/e2e/erc20/decimals/oneChainNot18Decimals.test.ts

@@ -1,31 +1,30 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
+import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
 import { expect, assert } from "chai";
 import { ethers } from "hardhat";
-import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
+
+import type {
+  StateRootStorage,
+  Bridge,
+  ERC20Handler,
+  ERC20PresetMinterPauser,
+  Executor,
+  Router,
+} from "../../../../typechain-types";
 import {
   deployBridgeContracts,
   createERCDepositData,
   getDepositEventData,
 } from "../../../helpers";
-
 import {
   accountProof3,
   storageProof3,
   accountProof4,
   storageProof4,
 } from "../../../testingProofs";
 
-import type {
-  StateRootStorage,
-  Bridge,
-  ERC20Handler,
-  ERC20PresetMinterPauser,
-  Executor,
-  Router,
-} from "../../../../typechain-types";
-
 describe("E2E ERC20 - Two EVM Chains, one with decimal places == 18, other with != 18", () => {
   const originDomainID = 1;
   const destinationDomainID = 2;

test/e2e/erc20/decimals/oneChainWith0Decimals.test.ts

@@ -1,31 +1,30 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
+
+import type {
+  Bridge,
+  ERC20Handler,
+  ERC20PresetMinterPauser,
+  Executor,
+  Router,
+  StateRootStorage,
+} from "../../../../typechain-types";
 import {
   deployBridgeContracts,
   createERCDepositData,
   getDepositEventData,
 } from "../../../helpers";
-
 import {
   accountProof5,
   storageProof5,
   accountProof6,
   storageProof6,
 } from "../../../testingProofs";
 
-import type {
-  Bridge,
-  ERC20Handler,
-  ERC20PresetMinterPauser,
-  Executor,
-  Router,
-  StateRootStorage,
-} from "../../../../typechain-types";
-
 describe("E2E ERC20 - Two EVM Chains, one with decimal places == 18, other with == 0", () => {
   const originDomainID = 1;
   const destinationDomainID = 2;

test/e2e/erc20/decimals/roundingLoss.test.ts

@@ -1,32 +1,31 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
+
+import type {
+  Bridge,
+  ERC20Handler,
+  ERC20PresetMinterPauser,
+  Router,
+  Executor,
+  StateRootStorage,
+} from "../../../../typechain-types";
 import {
   deployBridgeContracts,
   createERCDepositData,
   toHex,
   getDepositEventData,
 } from "../../../helpers";
-
 import {
   accountProof7,
   storageProof7,
   accountProof8,
   storageProof8,
 } from "../../../testingProofs";
 
-import type {
-  Bridge,
-  ERC20Handler,
-  ERC20PresetMinterPauser,
-  Router,
-  Executor,
-  StateRootStorage,
-} from "../../../../typechain-types";
-
 describe("E2E ERC20 - Two EVM Chains both with decimal places != 18 with rounding loss", () => {
   const originDomainID = 1;
   const destinationDomainID = 2;

test/e2e/erc20/differentChainsMock.test.ts

@@ -1,17 +1,9 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-import { ethers } from "hardhat";
-import { assert, expect } from "chai";
 import type { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
-import { deployBridgeContracts, createERCDepositData } from "../../helpers";
-
-import {
-  accountProof1,
-  storageProof1,
-  accountProof2,
-  storageProof2,
-} from "../../testingProofs";
+import { assert, expect } from "chai";
+import { ethers } from "hardhat";
 
 import type {
   Bridge,
@@ -21,6 +13,13 @@ import type {
   ERC20PresetMinterPauser,
   StateRootStorage,
 } from "../../../typechain-types";
+import { deployBridgeContracts, createERCDepositData } from "../../helpers";
+import {
+  accountProof1,
+  storageProof1,
+  accountProof2,
+  storageProof2,
+} from "../../testingProofs";
 
 describe("E2E ERC20 - Two EVM Chains", () => {
   const originDomainID = 1;