Merge branch 'main' into feat/update-forge-std-v1.9.0

.github/workflows/coverage_check.yml → .github/workflows/coverage.yml

@@ -1,4 +1,4 @@
-name: Coverage check on main push
+name: Coverage Check
 
 on: [push]
 
@@ -7,6 +7,7 @@ env:
 
 jobs:
   upload-coverage:
+    name: Upload Coverage
     runs-on: ubuntu-latest
 
     steps:
@@ -28,7 +29,7 @@ jobs:
 
       - name: Run coverage
         shell: bash
-        run: forge coverage --report summary --report lcov
+        run: yarn coverage
 
       - name: Setup LCOV
         uses: hrishikesh-kadam/setup-lcov@v1
@@ -43,7 +44,7 @@ jobs:
           coverage-files: lcovNew.info
 
       - name: Retrieve previous coverage
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: coverage.info
         continue-on-error: true
@@ -66,7 +67,7 @@ jobs:
           mv lcovNew.info coverage.info
 
       - name: Upload the new coverage
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: coverage.info
-          path: ./coverage.info
+          path: ./coverage.info

.gitignore

@@ -19,3 +19,7 @@ broadcast/*/*/*
 
 # Out dir
 out
+crytic-export
+
+# Echidna corpus
+test/invariants/fuzz/echidna_coverage

package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "build": "forge build",
     "build:optimized": "FOUNDRY_PROFILE=optimized forge build",
-    "coverage": "forge coverage --match-contract Unit",
+    "coverage": "forge coverage --report summary --report lcov --match-path 'test/unit/*'",
     "deploy:mainnet": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $MAINNET_RPC --broadcast --chain mainnet --private-key $MAINNET_DEPLOYER_PK'",
     "deploy:sepolia": "bash -c 'source .env && forge script Deploy -vvvvv --rpc-url $SEPOLIA_RPC --broadcast --chain sepolia --private-key $SEPOLIA_DEPLOYER_PK'",
     "lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt --check",
@@ -22,7 +22,7 @@
     "lint:sol-tests": "solhint -c .solhint.tests.json 'test/**/*.sol'",
     "prepare": "husky install",
     "test": "forge test -vvv",
-    "test:fuzz": "echidna test/invariants/fuzz/Greeter.t.sol --contract GreeterInvariant --corpus-dir test/invariants/fuzz/echidna_coverage/ --test-mode assertion",
+    "test:fuzz": "echidna test/invariants/fuzz/Greeter.t.sol --contract InvariantGreeter --corpus-dir test/invariants/fuzz/echidna_coverage/ --test-mode assertion",
     "test:integration": "forge test --match-contract Integration -vvv",
     "test:symbolic": "halmos",
     "test:unit": "forge test --match-contract Unit -vvv",