From 615146d80a8fb52cada31aec48bcb3c96b50b780 Mon Sep 17 00:00:00 2001 From: Felipe Forbeck Date: Fri, 22 Mar 2024 14:10:45 -0300 Subject: [PATCH] Fix workflows and bump solcover version --- .github/workflows/coverage.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/slither.yml | 2 +- .github/workflows/test.yml | 2 +- .solcover.js | 2 ++ package-lock.json | 42 +++++++++++++++++++--------------- package.json | 2 +- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e7b099fc7..36c65b60f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Install dependencies - run: npm ci --omit=optional + run: npm ci - name: Check Coverage run: npm run coverage diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cc55cc283..a5ecaedc9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,7 @@ jobs: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Install dependencies - run: npm ci --omit=optional + run: npm ci - name: Compile contracts run: npm run compile diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 9a1486147..11d1606a1 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -35,7 +35,7 @@ jobs: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Install NPM dependencies - run: npm ci --omit=optional + run: npm ci - name: Compile Contracts run: npm run compile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9d527ff0c..f57dfebda 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Install dependencies - run: npm ci --omit=optional + run: npm ci - name: Run Linter run: npm run lint diff --git a/.solcover.js b/.solcover.js index b1deb8035..a9f0a6a24 100644 --- a/.solcover.js +++ b/.solcover.js @@ -25,6 +25,7 @@ module.exports = { "adapters/interfaces/ISignatures.sol", "adapters/interfaces/IVoting.sol", "extensions/IExtension.sol", + "nft/TributeERC721.sol", "helpers/WETH.sol", "test/MockDao.sol", "test/ERC1155TestToken.sol", @@ -38,6 +39,7 @@ module.exports = { "test/ERC1155TestAdapter.sol", "test/ERC721TestAdapter.sol", "test/CloneFactoryTest.sol", + "test/TributeERC721.sol", "test/TributeERC721V2.sol", "utils/Multicall.sol", "companion/interfaces/IReimbursement.sol", diff --git a/package-lock.json b/package-lock.json index 792c2cb76..7d2dc1dbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "prettier-plugin-solidity": "^1.0.0-beta.19", "rimraf": "3.0.2", "solhint": "3.3.6", - "solidity-coverage": "0.7.16", + "solidity-coverage": "^0.7.22", "truffle": "5.11.5", "truffle-abi": "1.0.3", "truffle-plugin-verify": "0.6.7", @@ -47398,18 +47398,17 @@ "dev": true }, "node_modules/solidity-coverage": { - "version": "0.7.16", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.16.tgz", - "integrity": "sha512-ttBOStywE6ZOTJmmABSg4b8pwwZfYKG8zxu40Nz+sRF5bQX7JULXWj/XbX0KXps3Fsp8CJXg8P29rH3W54ipxw==", + "version": "0.7.22", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.22.tgz", + "integrity": "sha512-I6Zd5tsFY+gmj1FDIp6w7OrUePx6ZpMgKQZg7dWgPaQHePLi3Jk+iJ8lwZxsWEoNy2Lcv91rMxATWHqRaFdQpw==", "dev": true, "dependencies": { - "@solidity-parser/parser": "^0.12.0", + "@solidity-parser/parser": "^0.14.0", "@truffle/provider": "^0.2.24", "chalk": "^2.4.2", "death": "^1.1.0", "detect-port": "^1.3.0", "fs-extra": "^8.1.0", - "ganache-cli": "^6.11.0", "ghost-testrpc": "^0.0.2", "global-modules": "^2.0.0", "globby": "^10.0.1", @@ -47428,10 +47427,13 @@ } }, "node_modules/solidity-coverage/node_modules/@solidity-parser/parser": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.12.2.tgz", - "integrity": "sha512-d7VS7PxgMosm5NyaiyDJRNID5pK4AWj1l64Dbz0147hJgy5k2C0/ZiKK/9u5c5K+HRUVHmp+RMvGEjGh84oA5Q==", - "dev": true + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.5.tgz", + "integrity": "sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg==", + "dev": true, + "dependencies": { + "antlr4ts": "^0.5.0-alpha.4" + } }, "node_modules/solidity-coverage/node_modules/@types/glob": { "version": "7.2.0", @@ -90773,18 +90775,17 @@ "dev": true }, "solidity-coverage": { - "version": "0.7.16", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.16.tgz", - "integrity": "sha512-ttBOStywE6ZOTJmmABSg4b8pwwZfYKG8zxu40Nz+sRF5bQX7JULXWj/XbX0KXps3Fsp8CJXg8P29rH3W54ipxw==", + "version": "0.7.22", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.7.22.tgz", + "integrity": "sha512-I6Zd5tsFY+gmj1FDIp6w7OrUePx6ZpMgKQZg7dWgPaQHePLi3Jk+iJ8lwZxsWEoNy2Lcv91rMxATWHqRaFdQpw==", "dev": true, "requires": { - "@solidity-parser/parser": "^0.12.0", + "@solidity-parser/parser": "^0.14.0", "@truffle/provider": "^0.2.24", "chalk": "^2.4.2", "death": "^1.1.0", "detect-port": "^1.3.0", "fs-extra": "^8.1.0", - "ganache-cli": "^6.11.0", "ghost-testrpc": "^0.0.2", "global-modules": "^2.0.0", "globby": "^10.0.1", @@ -90800,10 +90801,13 @@ }, "dependencies": { "@solidity-parser/parser": { - "version": "0.12.2", - "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.12.2.tgz", - "integrity": "sha512-d7VS7PxgMosm5NyaiyDJRNID5pK4AWj1l64Dbz0147hJgy5k2C0/ZiKK/9u5c5K+HRUVHmp+RMvGEjGh84oA5Q==", - "dev": true + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.5.tgz", + "integrity": "sha512-6dKnHZn7fg/iQATVEzqyUOyEidbn05q7YA2mQ9hC0MMXhhV3/JrsxmFSYZAcr7j1yUP700LLhTruvJ3MiQmjJg==", + "dev": true, + "requires": { + "antlr4ts": "^0.5.0-alpha.4" + } }, "@types/glob": { "version": "7.2.0", diff --git a/package.json b/package.json index 009f9dfb0..16dc562d7 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "prettier-plugin-solidity": "^1.0.0-beta.19", "rimraf": "3.0.2", "solhint": "3.3.6", - "solidity-coverage": "0.7.16", + "solidity-coverage": "^0.7.22", "truffle": "5.11.5", "truffle-abi": "1.0.3", "truffle-plugin-verify": "0.6.7",