update ci, gitignore

.github/workflows/ci.yml

@@ -2,30 +2,51 @@ name: CI
 
 on:
   push:
-    branches: 
+    branches:
       - main
   pull_request:
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Node.js environment
-      uses: actions/setup-node@v2-beta
-      with:
-        node-version: '10.x'
-        registry-url: 'https://registry.npmjs.org'
-    - name: Cache npm dependencies
-      uses: actions/cache@v1
-      with:
-        path: ~/.npm
-        key: ${{ runner.OS }}-npm-cache-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.OS }}-npm-cache-
-    - name: Install npm dependencies
-      run: npm install
-    - name: Process templates
-      run: npm run template:process
-    - name: Run tests
-      run: npm run test:ci
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20.x"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Cache npm dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: ${{ runner.OS }}-npm-cache-${{ hashFiles('./package-lock.json') }}
+          restore-keys: |
+            ${{ runner.OS }}-npm-cache-
+
+      - name: Install npm dependencies
+        run: npm install
+
+      - name: Process templates
+        run: npm run template:process
+
+      - name: Run Coverage and Hardhat tests
+        run: npm run test:ci
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Run Forge build
+        run: |
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          forge test -vvv
+        id: test

.gitignore

@@ -6,8 +6,8 @@ contractAddresses.json
 
 
 # ignore generated files
-src/root/predicates/TransferWithSigUtils.sol
-src/common/mixin/ChainIdMixin.sol
+contracts/root/predicates/TransferWithSigUtils.sol
+contracts/common/mixin/ChainIdMixin.sol
 test/helpers/marketplaceUtils.js
 cache_hardhat
 forge-cache

foundry.toml

@@ -2,7 +2,7 @@
 src = 'contracts'
 out = 'out'
 libs = ['node_modules']
-test = 'test'
+match-path = 'test/foundry'
 optimizer = true
 optimizer_runs = 200
 via_ir = true

hardhat.config.cjs

@@ -59,8 +59,8 @@ const networks = () => {
         accounts: [process.env.PK_MAINNET],
       },
     };
-  } else if (process.env.SOLIDITY_COVERAGE) {
-    console.log("using local hardhat network, so we don't overload infura")
+  } else if (process.env.LOCAL_NETWORK) {
+    console.log("using local hardhat network");
     return {
       hardhat: {
         blockGasLimit: 20000000,