Merge branch 'main' into nish-fix-170-upstream-1

matter-labs · Oct 27, 2023 · 666b021 · 666b021
2 parents e74a37d + e9c8ee0
commit 666b021
Show file tree

Hide file tree

Showing 31 changed files with 1,635 additions and 400 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -16,15 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install latest nightly
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2023-07-23
           components: rustfmt, clippy
 
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
-
       - uses: actions/setup-node@v3
         with:
           node-version: 18.x
@@ -45,12 +42,9 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
+          toolchain: nightly-2023-07-23
 
       - name: Build Code
         run: make all

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -8,28 +8,26 @@ on:
   pull_request:
     branches: [main]
   workflow_dispatch:
+
 jobs:
   test:
     name: unit-tests
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-latest]
+        platform: [macos-latest, ubuntu-22.04-github-hosted-16core]
     runs-on: ${{ matrix.platform }}
 
     steps:
     - name: Checkout Code
       uses: actions/checkout@v3
 
     - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with: 
-        toolchain: stable
-
-    - name: Cache Rust Dependencies
-      uses: Swatinem/rust-cache@v2
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: nightly-2023-07-21
 
     - name: Install cargo-nextest
-      run: cargo +stable install cargo-nextest
+      run: cargo install cargo-nextest
 
     - name: Run tests
       run: cargo nextest run
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -44,7 +44,7 @@
                 "ZKSYNC_HOME": "${workspaceFolder}"
             },
             "args": [
-                "--dev-use-local-contracts",
+                "--dev-system-contracts=local",
                 "run"
             ],
             "preLaunchTask": "rebuild-contracts",