fix: L-05 Unused Code

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

@@ -25,23 +25,33 @@ jobs:
       - name: Install dependencies
         run: yarn
 
-      - name: Build artifacts
-        run: yarn l1 build
+      - name: Install l2 deps
+        working-directory: ./l2-contracts
+        run: yarn
+
+      - name: Install l1 deps
+        working-directory: ./l1-contracts
+        run: yarn
 
-      - name: Build L2 artifacts
+      - name: Build l2 artifacts
         run: yarn l2 build
 
+      - name: Build l1 artifacts
+        run: yarn l1 build
+
       - name: Create cache
         uses: actions/cache/save@v3
         with:
           key: artifacts-l1-${{ github.sha }}
           path: |
             l1-contracts/artifacts
+            l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
+            l1-contracts/lib
 
   lint:
     runs-on: ubuntu-latest
@@ -91,11 +101,68 @@ jobs:
           key: artifacts-l1-${{ github.sha }}
           path: |
             l1-contracts/artifacts
+            l1-contracts/artifacts-zk
+            l1-contracts/cache
+            l1-contracts/typechain
+            l2-contracts/artifacts-zk
+            l2-contracts/cache-zk
+            l2-contracts/typechain
+            l1-contracts/lib
+
+      - name: Run tests
+        working-directory: ./l1-contracts
+        run: FOUNDRY_PROFILE=default yarn test:foundry
+
+  test-foundry-zksync:
+    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: Build system contract artifacts
+        run: yarn sc build
+
+      - name: Restore artifacts cache
+        uses: actions/cache/restore@v3
+        with:
+          fail-on-cache-miss: true
+          key: artifacts-l1-${{ github.sha }}
+          path: |
+            l1-contracts/artifacts
+            l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
+            l2-contracts/artifacts-zk
+            l2-contracts/cache-zk
+            l2-contracts/typechain
+            l1-contracts/lib
+
+      - name: Install foundry zksync
+        run: |
+          wget https://github.com/matter-labs/foundry-zksync/releases/download/nightly-f908ce43834bc1ffb4de6576ea5600eaab49dddb/foundry_nightly_linux_amd64.tar.gz -O foundry-zksync.tar.gz
+          tar -xzf foundry-zksync.tar.gz
+          sudo mv forge /usr/local/bin/forge
+          sudo mv cast /usr/local/bin/cast
+          sudo chmod +x /usr/local/bin/forge
+          sudo chmod +x /usr/local/bin/cast
+          forge --version
 
       - name: Run tests
-        run: yarn l1 test:foundry
+        working-directory: ./l1-contracts
+        run: FOUNDRY_PROFILE=default yarn test:zkfoundry
 
   test-hardhat:
     needs: [build, lint]
@@ -114,23 +181,32 @@ jobs:
       - name: Install dependencies
         run: yarn
 
+      - name: Install l1 deps
+        working-directory: ./l1-contracts
+        run: yarn
+
       - name: Restore artifacts cache
         uses: actions/cache/restore@v3
         with:
           fail-on-cache-miss: true
           key: artifacts-l1-${{ github.sha }}
           path: |
             l1-contracts/artifacts
+            l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
+            l1-contracts/lib
+
+      - name: Build L2 contracts
+        run: yarn l2 build
 
       - name: Run tests
         run: yarn l1 test --no-compile
 
-  check-verifier-generator:
+  check-verifier-generator-l1:
     runs-on: ubuntu-latest
 
     steps:
@@ -183,8 +259,13 @@ jobs:
           key: artifacts-l1-${{ github.sha }}
           path: |
             l1-contracts/artifacts
+            l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
+            l2-contracts/artifacts-zk
+            l2-contracts/cache-zk
+            l2-contracts/typechain
+            l1-contracts/lib
 
       - name: Run coverage
         run: FOUNDRY_PROFILE=default yarn test:foundry && FOUNDRY_PROFILE=default yarn coverage:foundry --report summary --report lcov

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

@@ -0,0 +1,129 @@
+name: L1 contracts foundry CI
+
+env:
+  ANVIL_PRIVATE_KEY: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+  ANVIL_RPC_URL: "http://127.0.0.1:8545"
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Use Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.18.0
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Build hardhat artifacts
+        run: yarn l1 build
+
+      - name: Build artifacts
+        working-directory: ./l1-contracts
+        run: forge build
+
+      - name: Build system-contract artifacts
+        run: yarn sc build
+
+      - name: Build l2 artifacts
+        run: yarn l2 build
+
+      - name: Create cache
+        uses: actions/cache/save@v3
+        with:
+          key: artifacts-l1-contracts-foudry-${{ github.sha }}
+          path: |
+            l1-contracts/cache
+            l1-contracts/out
+            l1-contracts/artifacts-zk
+            l2-contracts/artifacts-zk
+            l2-contracts/cache-zk
+            system-contracts/artifacts-zk
+            system-contracts/bootloader/build
+            system-contracts/cache-zk
+            system-contracts/contracts-preprocessed
+            system-contracts/typechain
+
+  scripts:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Restore artifacts cache
+        uses: actions/cache/restore@v3
+        with:
+          fail-on-cache-miss: true
+          key: artifacts-l1-contracts-foudry-${{ github.sha }}
+          path: |
+            l1-contracts/cache
+            l1-contracts/out
+            l1-contracts/artifacts-zk
+            l2-contracts/artifacts-zk
+            l2-contracts/cache-zk
+            system-contracts/artifacts-zk
+            system-contracts/bootloader/build
+            system-contracts/cache-zk
+            system-contracts/contracts-preprocessed
+            system-contracts/typechain
+
+      - name: Use Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Copy configs from template
+        working-directory: ./l1-contracts
+        run: cp -r deploy-script-config-template/. script-config
+
+      - name: Run anvil
+        run: |
+          anvil --silent &
+
+          ANVIL_READY=0
+          for i in {1..10}; do
+            if curl -s -o /dev/null $ANVIL_RPC_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"eth_chainId","id":1}'; then
+              echo "Anvil is ready"
+              ANVIL_READY=1
+              break
+            else
+              echo "Waiting for Anvil to become ready..."
+              sleep 1
+            fi
+          done
+
+          if [ $ANVIL_READY -ne 1 ]; then
+            echo "Anvil failed to become ready after 10 attempts."
+            exit 1
+          fi
+
+      - 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
+
+      - name: Run DeployErc20 script
+        working-directory: ./l1-contracts
+        run: forge script ./deploy-scripts/DeployErc20.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+# TODO restore scripts verification
+#      - name: Run RegisterZKChain script
+#        working-directory: ./l1-contracts
+#        run: |
+#          cat ./script-out/output-deploy-l1.toml >> ./script-config/register-zk-chain.toml
+#          forge script ./deploy-scripts/RegisterZKChain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+#      - name: Run InitializeL2WethToken script
+#        working-directory: ./l1-contracts-foundry
+#        run: forge script ./deploy-scripts/InitializeL2WethToken.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY

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

@@ -26,6 +26,9 @@ jobs:
       - name: Build L2 artifacts
         run: yarn l2 build
 
+      - name: Build system contract artifacts
+        run: yarn sc build
+
       - name: Create cache
         uses: actions/cache/save@v3
         with:
@@ -37,6 +40,9 @@ jobs:
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
+            system-contracts/artifacts-zk
+            system-contracts/cache-zk
+            system-contracts/typechain
 
   lint:
     runs-on: ubuntu-latest
@@ -57,6 +63,23 @@ jobs:
       - name: Lint
         run: yarn lint:check
 
+  check-verifier-generator-l2:
+    needs: [build]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Generate Verifier.sol
+        working-directory: tools
+        run: cargo run --bin zksync_verifier_contract_generator --release -- --input_path data/scheduler_key.json --l2_mode
+
+      - name: Compare
+        run: diff tools/data/Verifier.sol l2-contracts/contracts/verifier/Verifier.sol
+
   test:
     needs: [build, lint]
     runs-on: ubuntu-latest
@@ -88,12 +111,19 @@ jobs:
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
-
-      - name: Run Era test node
-        uses: dutterbutter/[email protected]
-
-      - name: Copy typechain from System Contracts
-        run: yarn sc build && yarn sc copy:typechain
+            system-contracts/artifacts-zk
+            system-contracts/cache-zk
+            system-contracts/typechain
+
+      - name: Install foundry zksync
+        run: |
+          wget https://github.com/matter-labs/foundry-zksync/releases/download/nightly-f908ce43834bc1ffb4de6576ea5600eaab49dddb/foundry_nightly_linux_amd64.tar.gz -O foundry-zksync.tar.gz
+          tar -xzf foundry-zksync.tar.gz
+          sudo mv forge /usr/local/bin/forge
+          sudo mv cast /usr/local/bin/cast
+          sudo chmod +x /usr/local/bin/forge
+          sudo chmod +x /usr/local/bin/cast
+          forge --version
 
       - name: Run tests
-        run: yarn l2 test
+        run: yarn l2 test:foundry

.gitignore

@@ -22,10 +22,13 @@ l1-contracts/lcov.info
 l1-contracts/report/*
 l1-contracts/coverage/*
 l1-contracts/out/*
+l1-contracts/zkout/*
 l1-contracts/broadcast/*
 l1-contracts/script-config/*
 !l1-contracts/script-config/artifacts
 l1-contracts/script-out/*
-l1-contracts/test/foundry/integration/deploy-scripts/script-out/*.toml
+l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/*.toml
 !l1-contracts/script-out/.gitkeep
 *.timestamp
+l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/*
+l1-contracts/zkout/*

.gitmodules

@@ -12,3 +12,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	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

.solhintignore

@@ -8,6 +8,7 @@ l1-contracts/lib
 l1-contracts/node_modules
 l1-contracts/contracts/dev-contracts
 l1-contracts/test
+l1-contracts/deploy-scripts
 
 # l1-contracts-foundry
 l1-contracts-foundry/cache
@@ -16,6 +17,7 @@ l1-contracts-foundry/lib
 # l2-contracts
 l2-contracts/cache-zk
 l2-contracts/node_modules
+l2-contracts/test
 
 # system-contracts
 system-contracts/contracts/openzeppelin