From 8f7b3327eb6f8b3da33083675e79bcedc82b71a5 Mon Sep 17 00:00:00 2001 From: Edmund Edgar Date: Fri, 1 Mar 2024 06:26:22 +0000 Subject: [PATCH 1/2] Revert "temporarly disabled hardhat test (#212)" This reverts commit 6ac21f2ea3d0ad830b955fa1b6f25b12bc7469aa. --- .github/workflows/testhardhat.yml | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/testhardhat.yml b/.github/workflows/testhardhat.yml index 53b5a3f9..f1383fdb 100644 --- a/.github/workflows/testhardhat.yml +++ b/.github/workflows/testhardhat.yml @@ -9,22 +9,22 @@ on: pull_request: branches: [main, develop] -# Temporary disabled due to a dependency issue. Locally the tests are running fine. -# jobs: -# lint-and-test: -# runs-on: ubuntu-latest -# strategy: -# matrix: -# node-version: [16.x] -# os: [ubuntu-latest] +jobs: + lint-and-test: + runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# - uses: actions/setup-node@v3 -# with: -# node-version: 16 -# cache: 'npm' -# cache-dependency-path: ./package-lock.json -# - run: npm install -# - run: npx hardhat test \ No newline at end of file + strategy: + matrix: + node-version: [16.x] + os: [ubuntu-latest] + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16 + cache: 'npm' + cache-dependency-path: ./package-lock.json + - run: npm install + - run: npx hardhat test \ No newline at end of file From a695bc07519a75f7d8980260287ad66d41445511 Mon Sep 17 00:00:00 2001 From: Edmund Edgar Date: Fri, 1 Mar 2024 06:29:02 +0000 Subject: [PATCH 2/2] Replace tags in package.json with the commits those tags are pointing to, as they seem to be ignored since they aren't correctly-formatted semver tags --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 81383522..8500047c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "hardhat": "^2.19.4" }, "devDependencies": { - "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v3.0.0-fork.6", + "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#2a5fee0cfd47d4d538270a0345dd1f062dba783d", "@nomicfoundation/hardhat-network-helpers": "^1.0.10", "@nomicfoundation/hardhat-verify": "^2.0.3", "@nomiclabs/hardhat-ethers": "^2.2.3", @@ -25,7 +25,7 @@ "@openzeppelin/contracts": "^4.9.5", "@openzeppelin/contracts-upgradeable": "^4.9.5", "@openzeppelin/hardhat-upgrades": "1.22.1", - "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#v3.0.0-RealityETH", + "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#a090458140cdfce23763af887ff0767469368923", "@types/sinon-chai": "^3.2.3", "circomlibjs": "0.1.1", "dotenv": "^8.6.0", @@ -45,7 +45,7 @@ }, "node_modules/@0xpolygonhermez/zkevm-commonjs": { "version": "3.0.0", - "resolved": "git+ssh://git@github.com/0xPolygonHermez/zkevm-commonjs.git", + "resolved": "git+ssh://git@github.com/0xPolygonHermez/zkevm-commonjs.git#2a5fee0cfd47d4d538270a0345dd1f062dba783d", "integrity": "sha512-AgGhS4OvByax/fwXY0bx+cAFr4dWKqGOIjSzH08nUGlSKwJcdtm6aSVztWWbSmxU6FPn1pCTEcvmkuVbMPtJFA==", "dev": true, "license": "pending", @@ -2280,7 +2280,7 @@ "node_modules/@RealityETH/zkevm-contracts": { "name": "@0xpolygonhermez/zkevm-contracts", "version": "3.0.0", - "resolved": "git+ssh://git@github.com/RealityETH/zkevm-contracts.git", + "resolved": "git+ssh://git@github.com/RealityETH/zkevm-contracts.git#a090458140cdfce23763af887ff0767469368923", "integrity": "sha512-T/ljSvXriV/1o+CtlQMXD4vIzqlEM2rUJqa6qW4nEsViu+1z7BSLgwF65tGRLv4yIIlRiFyTPA3nPvfRaABMgA==", "dev": true, "license": "pending", @@ -12600,10 +12600,10 @@ }, "dependencies": { "@0xpolygonhermez/zkevm-commonjs": { - "version": "git+ssh://git@github.com/0xPolygonHermez/zkevm-commonjs.git", + "version": "git+ssh://git@github.com/0xPolygonHermez/zkevm-commonjs.git#2a5fee0cfd47d4d538270a0345dd1f062dba783d", "integrity": "sha512-AgGhS4OvByax/fwXY0bx+cAFr4dWKqGOIjSzH08nUGlSKwJcdtm6aSVztWWbSmxU6FPn1pCTEcvmkuVbMPtJFA==", "dev": true, - "from": "@0xpolygonhermez/zkevm-commonjs@github:0xPolygonHermez/zkevm-commonjs#v3.0.0-fork.6", + "from": "@0xpolygonhermez/zkevm-commonjs@github:0xPolygonHermez/zkevm-commonjs#2a5fee0cfd47d4d538270a0345dd1f062dba783d", "requires": { "@ethereumjs/block": "^3.6.2", "@ethereumjs/tx": "^3.4.0", @@ -14183,10 +14183,10 @@ "requires": {} }, "@RealityETH/zkevm-contracts": { - "version": "git+ssh://git@github.com/RealityETH/zkevm-contracts.git", + "version": "git+ssh://git@github.com/RealityETH/zkevm-contracts.git#a090458140cdfce23763af887ff0767469368923", "integrity": "sha512-T/ljSvXriV/1o+CtlQMXD4vIzqlEM2rUJqa6qW4nEsViu+1z7BSLgwF65tGRLv4yIIlRiFyTPA3nPvfRaABMgA==", "dev": true, - "from": "@RealityETH/zkevm-contracts@github:RealityETH/zkevm-contracts#v3.0.0-RealityETH", + "from": "@RealityETH/zkevm-contracts@github:RealityETH/zkevm-contracts#a090458140cdfce23763af887ff0767469368923", "requires": { "chai": "^4.3.7", "ethers": "^5.7.2" diff --git a/package.json b/package.json index d594c7e7..6d1fbe8b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "hardhat": "^2.19.4" }, "devDependencies": { - "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v3.0.0-fork.6", + "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#2a5fee0cfd47d4d538270a0345dd1f062dba783d", "@nomicfoundation/hardhat-network-helpers": "^1.0.10", "@nomicfoundation/hardhat-verify": "^2.0.3", "@nomiclabs/hardhat-ethers": "^2.2.3", @@ -47,7 +47,7 @@ "@openzeppelin/contracts": "^4.9.5", "@openzeppelin/contracts-upgradeable": "^4.9.5", "@openzeppelin/hardhat-upgrades": "1.22.1", - "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#v3.0.0-RealityETH", + "@RealityETH/zkevm-contracts": "github:RealityETH/zkevm-contracts#a090458140cdfce23763af887ff0767469368923", "@types/sinon-chai": "^3.2.3", "circomlibjs": "0.1.1", "dotenv": "^8.6.0",