Draft v30

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

@@ -246,43 +246,25 @@ jobs:
         working-directory: tools
         run: rustup toolchain install
 
-      - name: Generate verifiers
+      - name: Generate Era verifiers
         working-directory: tools
-        run: cargo run
+        run: cargo run --bin zksync_verifier_contract_generator --release -- --variant era
 
-      - name: Compare L1VerifierPlonk.sol
-        run: diff tools/data/VerifierPlonk.sol l1-contracts/contracts/state-transition/verifiers/L1VerifierPlonk.sol
+      - name: Compare EraVerifierPlonk.sol
+        run: diff tools/data/EraVerifierPlonk.sol l1-contracts/contracts/state-transition/verifiers/EraVerifierPlonk.sol
 
-      - name: Compare VerifierFflonk.sol
-        run: diff tools/data/VerifierFflonk.sol l1-contracts/contracts/state-transition/verifiers/L1VerifierFflonk.sol
+      - name: Compare EraVerifierFflonk.sol
+        run: diff tools/data/EraVerifierFflonk.sol l1-contracts/contracts/state-transition/verifiers/EraVerifierFflonk.sol
 
-  check-verifier-generator-l2:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.72.0
-
-      - name: Install Rust toolchain
-        working-directory: tools
-        run: rustup toolchain install
-
-      - name: Generate verifiers
+      - name: Generate ZKsyncOS verifiers
         working-directory: tools
-        run: cargo run -- --l2_mode
+        run: cargo run --bin zksync_verifier_contract_generator --release -- --variant zksync-os
 
-      - name: Compare L2VerifierPlonk.sol
-        run: diff tools/data/VerifierPlonk.sol l1-contracts/contracts/state-transition/verifiers/L2VerifierPlonk.sol
+      - name: Compare ZKsyncOSVerifierPlonk.sol
+        run: diff tools/data/ZKsyncOSVerifierPlonk.sol l1-contracts/contracts/state-transition/verifiers/ZKsyncOSVerifierPlonk.sol
 
-      - name: Compare L2VerifierFflonk.sol
-        run: diff tools/data/VerifierFflonk.sol l1-contracts/contracts/state-transition/verifiers/L2VerifierFflonk.sol
+      - name: Compare ZKsyncOSVerifierFflonk.sol
+        run: diff tools/data/ZKsyncOSVerifierFflonk.sol l1-contracts/contracts/state-transition/verifiers/ZKsyncOSVerifierFflonk.sol
 
   coverage:
     defaults:

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

@@ -73,46 +73,3 @@ jobs:
 
       - name: Lint
         run: yarn lint:check
-
-  test:
-    needs: [build, lint]
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.18.0
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Restore artifacts cache
-        uses: actions/cache/restore@v3
-        with:
-          fail-on-cache-miss: true
-          key: artifacts-l2-${{ github.sha }}
-          path: |
-            da-contracts/out
-            l1-contracts/cache-forge
-            l1-contracts/out
-            l1-contracts/zkout
-            l2-contracts/cache-forge
-            l2-contracts/zkout
-
-      - name: Install foundry-zksync
-        run: |
-          mkdir ./foundry-zksync
-          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly-ae913af65381734ad46c044a9495b67310bc77c4/foundry_nightly_linux_amd64.tar.gz
-          tar zxf foundry_nightly_linux_amd64.tar.gz -C ./foundry-zksync
-          chmod +x ./foundry-zksync/forge ./foundry-zksync/cast
-          echo "$PWD/foundry-zksync" >> $GITHUB_PATH
-
-      - name: Run tests
-        run: yarn l2 test:foundry

.github/workflows/slither.yaml

@@ -43,27 +43,21 @@ jobs:
         run: |
           rm -rf ./l1-contracts/contracts/state-transition/utils/
           rm -rf ./l1-contracts/contracts/state-transition/verifiers/DualVerifier.sol
-          rm -rf ./l1-contracts/contracts/state-transition/verifiers/L1VerifierPlonk.sol
-          rm -rf ./l1-contracts/contracts/state-transition/verifiers/L1VerifierFflonk.sol
-          rm -rf ./l1-contracts/contracts/state-transition/verifiers/L2VerifierPlonk.sol
-          rm -rf ./l1-contracts/contracts/state-transition/verifiers/L2VerifierFflonk.sol
+          rm -rf ./l1-contracts/contracts/state-transition/verifiers/VerifierPlonk.sol
+          rm -rf ./l1-contracts/contracts/state-transition/verifiers/VerifierFflonk.sol
           rm -rf ./l1-contracts/contracts/state-transition/verifiers/TestnetVerifier.sol
-          rm -rf ./l1-contracts/contracts/state-transition/verifiers/L2TestnetVerifier.sol
           rm -rf ./l1-contracts/contracts/dev-contracts/test/PlonkVerifierTest.sol
           rm -rf ./l1-contracts/contracts/dev-contracts/test/PlonkVerifierRecursiveTest.sol
-          rm -rf ./l1-contracts/contracts/dev-contracts/test/L2PlonkVerifierTest.sol
-          rm -rf ./l1-contracts/contracts/dev-contracts/test/L2PlonkVerifierRecursiveTest.sol
           rm -rf ./l1-contracts/contracts/dev-contracts/test/VerifierTest.sol
           rm -rf ./l1-contracts/contracts/dev-contracts/test/VerifierRecursiveTest.sol
           rm -rf ./l1-contracts/contracts/dev-contracts/test/DummyPlonkVerifier.sol
-          rm -rf ./l1-contracts/contracts/dev-contracts/test/L2VerifierTest.sol
-          rm -rf ./l1-contracts/contracts/dev-contracts/test/L2VerifierRecursiveTest.sol
           rm -rf ./l1-contracts/contracts/state-transition/chain-deps/GatewayCTMDeployer.sol
 
       - name: Run Slither for L1 contracts
         working-directory: ./l1-contracts
+        # FIXME? --skip assembly because otherwise IR for DummyVerifierPlonk can't be generated (Slither issue).
         run: |
-          slither --config ./slither.config.json .
+          slither --config ./slither.config.json --skip-assembly .
 
       - name: Run Slither for L2 contracts
         working-directory: ./l2-contracts

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

@@ -154,3 +154,33 @@
       - name: Print output logs of anvil-zksync
         if: always()
         run: cat anvil_zksync.log
+
+  test-contracts-foundry:
+    needs: [lint]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.18.0
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Install foundry-zksync
+        run: |
+          mkdir ./foundry-zksync
+          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly-5353a10345187933527fbad213d8c4f6500a775c/foundry_nightly_linux_amd64.tar.gz
+          tar zxf foundry_nightly_linux_amd64.tar.gz -C ./foundry-zksync
+          chmod +x ./foundry-zksync/forge ./foundry-zksync/cast
+          echo "$PWD/foundry-zksync" >> $GITHUB_PATH
+
+      - name: Run tests using foundry
+        run: yarn sc test:foundry

.gitmodules

@@ -14,4 +14,4 @@
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/@matterlabs/zksync-contracts"]
 	path = lib/@matterlabs/zksync-contracts
-	url = https://github.com/matter-labs/v2-testnet-contracts
+	url = https://github.com/matter-labs/zksync-contracts