-
Notifications
You must be signed in to change notification settings - Fork 86
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor dependencies to use latest versions and update CI workflows for safe-modules-allowance. #490
Refactor dependencies to use latest versions and update CI workflows for safe-modules-allowance. #490
Changes from 12 commits
8196284
26f9ba5
b169b8c
7b97063
0da7502
a9a107d
33c00cb
516d24f
4c9ee80
6dcdf78
cdb703c
77c361c
bc55911
6dfab23
2f0a306
4fa5de0
23589e2
372d18e
6179e7f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
name: safe-modules-allowance | ||
on: | ||
push: | ||
paths: | ||
- 'modules/allowances/**' | ||
|
||
jobs: | ||
tests: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Install pnpm | ||
uses: pnpm/action-setup@v3 | ||
with: | ||
version: 9 | ||
- uses: actions/setup-node@v4 | ||
with: | ||
node-version: 20.x | ||
cache: pnpm | ||
- run: | | ||
pnpm install | ||
pnpm run --filter "@safe-global/safe-allowance-module" coverage | ||
- uses: coverallsapp/github-action@master | ||
with: | ||
path-to-lcov: modules/allowances/coverage/lcov.info | ||
github-token: ${{ secrets.GITHUB_TOKEN }} | ||
lint: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Install pnpm | ||
uses: pnpm/action-setup@v3 | ||
with: | ||
version: 9 | ||
- uses: actions/setup-node@v4 | ||
with: | ||
node-version: 20.x | ||
cache: pnpm | ||
- run: | | ||
pnpm install | ||
pnpm run --filter "@safe-global/safe-allowance-module" lint | ||
pnpm run --filter "@safe-global/safe-allowance-module" fmt:check | ||
pnpm run --filter "@safe-global/safe-allowance-module" build |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,9 +15,10 @@ | |
], | ||
"rule_sanity": "basic", | ||
"solc": "solc8.23", | ||
"solc_allow_path":"../../node_modules", | ||
"verify": "Safe4337Module:certora/specs/Safe4337Module.spec", | ||
"packages": [ | ||
"@account-abstraction=../../node_modules/.pnpm/@[email protected]/node_modules/@account-abstraction", | ||
"@safe-global=../../node_modules/.pnpm/@[email protected][email protected][email protected][email protected]_/node_modules/@safe-global" | ||
"@account-abstraction=node_modules/@account-abstraction", | ||
"@safe-global=node_modules/@safe-global" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,9 +8,10 @@ | |
"msg": "Safe4337Module: Signatures Length Check", | ||
"rule_sanity": "basic", | ||
"solc": "solc8.23", | ||
"solc_allow_path":"../../node_modules", | ||
"verify": "Safe4337ModuleHarness:certora/specs/SignatureLengthCheck.spec", | ||
"packages": [ | ||
"@account-abstraction=../../node_modules/.pnpm/@[email protected]/node_modules/@account-abstraction", | ||
"@safe-global=../../node_modules/.pnpm/@[email protected][email protected][email protected][email protected]_/node_modules/@safe-global" | ||
"@account-abstraction=node_modules/@account-abstraction", | ||
"@safe-global=node_modules/@safe-global" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,9 +15,10 @@ | |
], | ||
"rule_sanity": "advanced", | ||
"solc": "solc8.23", | ||
"solc_allow_path":"../../node_modules", | ||
"verify": "Safe4337Module:certora/specs/TransactionExecutionMethods.spec", | ||
"packages": [ | ||
"@account-abstraction=../../node_modules/.pnpm/@[email protected]/node_modules/@account-abstraction", | ||
"@safe-global=../../node_modules/.pnpm/@[email protected][email protected][email protected][email protected]_/node_modules/@safe-global" | ||
"@account-abstraction=node_modules/@account-abstraction", | ||
"@safe-global=node_modules/@safe-global" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🎉 |
||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,9 +15,10 @@ | |
], | ||
"rule_sanity": "basic", | ||
"solc": "solc8.23", | ||
"solc_allow_path":"../../node_modules", | ||
"verify": "Safe4337Module:certora/specs/ValidationDataLastBitOne.spec", | ||
"packages": [ | ||
"@account-abstraction=../../node_modules/.pnpm/@[email protected]/node_modules/@account-abstraction", | ||
"@safe-global=../../node_modules/.pnpm/@[email protected][email protected][email protected][email protected]_/node_modules/@safe-global" | ||
"@account-abstraction=node_modules/@account-abstraction", | ||
"@safe-global=node_modules/@safe-global" | ||
] | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
certora-cli==7.10.1 | ||
certora-cli==7.10.2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,17 +17,25 @@ | |
"prepare": "pnpm run clean && npm run build", | ||
"lint": "pnpm run lint:sol && npm run lint:ts", | ||
"lint:sol": "solhint 'contracts/**/*.sol'", | ||
"lint:ts": "eslint 'tasks/**/*.ts' 'test/**/*.ts' --max-warnings 0 --fix", | ||
"fmt": "pnpm run fmt:sol && npm run fmt:ts", | ||
"fmt:sol": "prettier 'contracts/**/*.sol' -w", | ||
"fmt:ts": "prettier 'tasks/**/*.ts' 'test/**/*.ts' -w" | ||
"lint:sol:fix": "solhint 'contracts/**/*.sol' --fix", | ||
"lint:ts": "eslint 'tasks/**/*.ts' 'test/**/*.ts' --max-warnings 0", | ||
"lint:ts:fix": "eslint 'tasks/**/*.ts' 'test/**/*.ts' --max-warnings 0 --fix", | ||
"fmt": "pnpm run fmt:sol:write && npm run fmt:ts:write", | ||
"fmt:check": "pnpm run fmt:sol:check && npm run fmt:ts:check", | ||
"fmt:sol:check": "prettier 'contracts/**/*.sol' --check", | ||
"fmt:ts:check": "prettier 'tasks/**/*.ts' 'test/**/*.ts' --check", | ||
"fmt:sol:write": "prettier 'contracts/**/*.sol' --write", | ||
"fmt:ts:write": "prettier 'tasks/**/*.ts' 'test/**/*.ts' --write" | ||
}, | ||
"author": "[email protected]", | ||
"license": "ISC", | ||
"author": "safe-global", | ||
"license": "GPL-3.0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. FYI: GPL-3.0 is deprecated. https://spdx.org/licenses/GPL-3.0.html There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the one we use in the other files, I'd raise this with legal. It says the identifier has been deprecated but not the license. We need a translation from legalese There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I changed it to GPL because this is the one we use in other files. I see it's deprecated and asked in Slack which one we should use. Let's address this later in a different PR (I can also revert the change until we get more clarity) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
The non-deprecated identifier is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Basically, the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looking at the contract code, this should be |
||
"devDependencies": { | ||
"@nomicfoundation/hardhat-toolbox": "^5.0.0", | ||
"@nomicfoundation/hardhat-ethers": "^3.0.7", | ||
"@nomicfoundation/hardhat-network-helpers": "^1.0.11", | ||
"@openzeppelin/contracts": "^5.0.2", | ||
"@safe-global/safe-deployments": "^1.37.0", | ||
"@safe-global/safe-contracts": "1.4.1-build.0", | ||
"@safe-global/safe-deployments": "^1.37.3", | ||
"@typechain/ethers-v6": "^0.5.1", | ||
"@typechain/hardhat": "^9.1.0", | ||
"@types/mocha": "^10.0.7", | ||
|
@@ -36,13 +44,13 @@ | |
"@typescript-eslint/parser": "^7.12.0", | ||
"dotenv": "^16.4.5", | ||
"eslint": "^8.57.0", | ||
"ethers": "^6.13.1", | ||
"hardhat": "^2.22.5", | ||
"ethers": "^6.13.2", | ||
"hardhat": "^2.22.9", | ||
"hardhat-deploy": "^0.12.4", | ||
"solhint": "^5.0.1", | ||
"solidity-coverage": "^0.8.12", | ||
"solhint": "^5.0.3", | ||
"solidity-coverage": "^0.8.13", | ||
"ts-node": "^10.9.2", | ||
"typechain": "^8.3.2", | ||
"typescript": "^5.5.2" | ||
"typescript": "^5.5.4" | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously there was a bug with solc's allow path option and certora-cli, now it's fixed we can use it and get rid of the crazy direct links