Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 18, 2023
2 parents 371c396 + 56d5ece commit c67e045
Show file tree
Hide file tree
Showing 48 changed files with 6,607 additions and 536 deletions.
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# directories
node_modules
coverage
lib
typechain-types
21 changes: 21 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"env": {
"node": true
},
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"],
"parserOptions": {
"project": ["tsconfig.json"],
"ecmaVersion": "latest",
"sourceType": "module"
},
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"rules": {},
"settings": {
"import/resolver": {
"node": {
"extensions": [".ts"]
}
}
}
}
10 changes: 5 additions & 5 deletions .github/workflows/smart-contracts-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
test-unit:
env:
FOUNDRY_FUZZ_RUNS: "5000"
needs: [ "lint", "build" ]
needs: ["lint", "build"]
runs-on: "ubuntu-latest"
steps:
- name: "Check out the repo"
Expand All @@ -84,15 +84,15 @@ jobs:
uses: "foundry-rs/foundry-toolchain@v1"

- name: "Run the unit tests"
run: "forge test --match-path \"test/*\""
run: 'forge test --match-path "test/*"'

- name: "Add test summary"
run: |
echo "## Unit tests result" >> $GITHUB_STEP_SUMMARY
echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
coverage:
needs: [ "lint", "build" ]
needs: ["lint", "build"]
runs-on: "ubuntu-latest"
steps:
- name: "Check out the repo"
Expand All @@ -104,7 +104,7 @@ jobs:
uses: "foundry-rs/foundry-toolchain@v1"

- name: "Generate the coverage report using the unit tests"
run: "forge coverage --match-path \"test/**/*.sol\" --report lcov"
run: 'forge coverage --match-path "test/**/*.sol" --report lcov'

- name: "Upload coverage report to Codecov"
uses: "codecov/codecov-action@v3"
Expand All @@ -126,7 +126,7 @@ jobs:
echo "✅ Uploaded to Codecov" >> $GITHUB_STEP_SUMMARY
upgradeability:
needs: [ "lint", "build" ]
needs: ["lint", "build"]
runs-on: "ubuntu-latest"
steps:
- name: "Check out the repo"
Expand Down
9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
cache/
out/

# Ignores development broadcast logs
!/broadcast
/broadcast/*/31337/
/broadcast/**/dry-run/

# Docs
docs/

# Dotenv file
.env

Expand All @@ -28,4 +20,3 @@ coverage
cache_hardhat
artifacts
typechain-types
.openzeppelin
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
branch = "release-v4.9"
path = "lib/openzeppelin-contracts-upgradeable"
url = "https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable"
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
Loading

0 comments on commit c67e045

Please sign in to comment.