Draft v28

.github/workflows/l1-contracts-foundry-ci.yaml

@@ -111,7 +111,9 @@ jobs:
 
       - name: Run DeployL1 script
         working-directory: ./l1-contracts
-        run: forge script ./deploy-scripts/DeployL1.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+        # l1-contracts are skipped because we don't want to recompile Bridgehub with a high optimizer-runs value.
+        # Otherwise, the Bridgehub contract size would be too large.
+        run: forge script ./deploy-scripts/DeployL1.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY --skip '*/l1-contracts/contracts/*'
 
       - name: Run DeployErc20 script
         working-directory: ./l1-contracts

.github/workflows/system-contracts-ci.yaml

@@ -25,14 +25,22 @@
         uses: actions/setup-node@v3
         with:
           node-version: 18.18.0
-          cache: yarn
+
+      - name: Install Yarn
+        run: npm install -g yarn
 
       - name: Build artifacts
         working-directory: system-contracts
         run: |
           yarn install
-          yarn build:foundry
           yarn build
+          yarn build:foundry
+
+      - name: Build artifacts
+        working-directory: l1-contracts
+        run: |
+          yarn install
+          yarn build:foundry
 
       - name: Create cache
         uses: actions/cache/save@v3
@@ -46,6 +54,7 @@
             system-contracts/cache-zk
             system-contracts/typechain
             system-contracts/contracts-preprocessed
+            l1-contracts/zkout
 
   lint:
     runs-on: ubuntu-latest
@@ -61,43 +70,43 @@
           cache: yarn
 
       - name: Install dependencies
         run: yarn
 
       - name: Run lint
         run: yarn lint:check
 
-  # FIXME: recover when used multivm is updated
-  # test-bootloader:
-  #   needs: [build, lint]
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: Checkout the repository
-  #       uses: actions/checkout@v4
-
-  #     - name: Install rust
-  #       uses: actions-rust-lang/setup-rust-toolchain@v1
-  #       with:
-  #         toolchain: nightly-2024-08-01
-
-  # - name: Restore artifacts cache
-  #   uses: actions/cache/restore@v3
-  #   with:
-  #     fail-on-cache-miss: true
-  #     key: artifacts-system-${{ github.sha }}
-  #     path: |
-  #       system-contracts/zkout
-  #       system-contracts/cache-forge
-  #       system-contracts/bootloader/build
-  #       system-contracts/artifacts-zk
-  #       system-contracts/cache-zk
-  #       system-contracts/typechain
-  #       system-contracts/contracts-preprocessed
-
-  #     - name: Run bootloader tests
-  #       run: |
-  #         cd system-contracts/bootloader/test_infra
-  #         cargo run
+  test-bootloader:
+    needs: [build, lint]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: nightly-2024-08-01
+
+      - name: Restore artifacts cache
+        uses: actions/cache/restore@v3
+        with:
+          fail-on-cache-miss: true
+          key: artifacts-system-${{ github.sha }}
+          path: |
+            system-contracts/zkout
+            system-contracts/cache-forge
+            system-contracts/bootloader/build
+            system-contracts/artifacts-zk
+            system-contracts/cache-zk
+            system-contracts/typechain
+            system-contracts/contracts-preprocessed
+            l1-contracts/zkout
+
+      - name: Run bootloader tests
+        run: |
+          cd system-contracts/bootloader/test_infra
+          cargo run
 
   test-contracts:
     needs: [build, lint]
@@ -113,10 +122,13 @@
           node-version: 18.18.0
           cache: yarn
 
-      - name: Use era-test-node for testing
-        uses: dutterbutter/era-test-node-action@v0.1.3
+      - name: Run anvil-zksync
+        uses: dutterbutter/anvil-zksync-action@v1.1.0
         with:
-          releaseTag: v0.0.1-vm1.5.0
+          mode: run
+          releaseTag: aa7f1aa
+          protocolVersion: 28
+          emulateEvm: true
 
       - name: Install dependencies
         run: yarn
@@ -138,6 +150,6 @@
       - name: Run tests
         run: yarn sc test
 
-      - name: Print output logs of era_test_node
+      - name: Print output logs of anvil-zksync
         if: always()
-        run: cat era_test_node.log
+        run: cat anvil_zksync.log