Oz audit sep head

.eslintrc

@@ -11,6 +11,7 @@
     "no-console": "off"
   },
   "ignorePatterns": [
-    "**/lib/*"
+    "**/lib/*",
+    "lib/*"
   ]
 }

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

@@ -3,6 +3,11 @@ name: L1 contracts CI
 on:
   pull_request:
 
+# We need this permissions for this CI to work with external contributions
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -20,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: Build L2 artifacts
+      - name: Install l1 deps
+        working-directory: ./l1-contracts
+        run: yarn
+
+      - 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
@@ -86,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
-        run: yarn l1 test:foundry
+        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
+        working-directory: ./l1-contracts
+        run: FOUNDRY_PROFILE=default yarn test:zkfoundry
 
   test-hardhat:
     needs: [build, lint]
@@ -109,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:
@@ -178,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
@@ -194,7 +280,7 @@ jobs:
       - name: Filter directories
         run: |
           sudo apt update && sudo apt install -y lcov
-          lcov --remove lcov.info 'test/*' 'contracts/dev-contracts/*' 'lib/*' --output-file lcov.info --rc lcov_branch_coverage=1
+          lcov --remove lcov.info 'test/*' 'contracts/dev-contracts/*' '../lib/forge-std/*' '../lib/murky/*' 'lib/*' '../lib/*' 'lib/' --output-file lcov.info --rc lcov_branch_coverage=1
 
       # This step posts a detailed coverage report as a comment and deletes previous comments on
       # each push. The below step is used to fail coverage if the specified coverage threshold is

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

@@ -28,20 +28,29 @@ jobs:
       - 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
@@ -65,6 +74,9 @@ jobs:
           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
@@ -76,7 +88,7 @@ jobs:
 
       - name: Copy configs from template
         working-directory: ./l1-contracts
-        run: cp -r deploy-script-config-template script-config
+        run: cp -r deploy-script-config-template/. script-config
 
       - name: Run anvil
         run: |
@@ -107,11 +119,11 @@ jobs:
         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 RegisterHyperchain script
+#      - name: Run RegisterZKChain script
 #        working-directory: ./l1-contracts
 #        run: |
-#          cat ./script-out/output-deploy-l1.toml >> ./script-config/register-hyperchain.toml
-#          forge script ./deploy-scripts/RegisterHyperchain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+#          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,9 +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

@@ -1,14 +1,17 @@
-[submodule "l1-contracts/lib/forge-std"]
-	path = l1-contracts/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "l1-contracts/lib/murky"]
-	path = l1-contracts/lib/murky
+[submodule "lib/murky"]
+	path = lib/murky
 	url = https://github.com/dmfxyz/murky
-[submodule "l1-contracts/lib/openzeppelin-contracts-upgradeable"]
-	path = l1-contracts/lib/openzeppelin-contracts-upgradeable
+[submodule "lib/openzeppelin-contracts-upgradeable-v4"]
+	path = lib/openzeppelin-contracts-upgradeable-v4
 	url = https://github.com/Openzeppelin/openzeppelin-contracts-upgradeable
 	branch = release-v4.9
-[submodule "l1-contracts/lib/openzeppelin-contracts"]
-	path = l1-contracts/lib/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-v4"]
+	path = lib/openzeppelin-contracts-v4
 	url = https://github.com/Openzeppelin/openzeppelin-contracts
 	branch = release-v4.9
+[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

.markdownlintignore

@@ -2,7 +2,6 @@
 node_modules
 
 # l1-contracts
-l1-contracts/lib
 l1-contracts/node_modules
 
 # l1-contracts-foundry
@@ -14,3 +13,8 @@ l2-contracts/node_modules
 # system-contracts
 system-contracts/node_modules
 system-contracts/bootloader/test_infra/target
+
+l1-contracts/lib
+lib/
+l2-contracts/lib
+system-contracts/lib

.prettierignore

@@ -1,6 +1,7 @@
 tools/data
 l1-contracts/lib
 l1-contracts-foundry/lib
+lib
 system-contracts/contracts/openzeppelin
 system-contracts/contracts/Constants.sol
 system-contracts/artifacts-zk
@@ -10,3 +11,6 @@ l1-contracts/cache
 l1-contracts/cache-forge
 l1-contracts/artifacts
 l1-contracts/artifacts-forge
+l1-contracts/zkout
+l2-contracts/zkout
+system-contracts/zkout