Merge branch 'main' into evl-add-new-state-machine-to-witness-transition

matter-labs · Nov 7, 2023 · e243a40 · e243a40
2 parents dd2fb03 + 2df8144
commit e243a40
Show file tree

Hide file tree

Showing 404 changed files with 20,818 additions and 6,681 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -5,4 +5,8 @@ build/
 dist/
 volumes/
 .tslintrc.js
-bellman-cuda
+bellman-cuda
+
+# Ignore contract submodules
+contracts
+etc/system-contracts
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-# What ❔
+## What ❔
 
 <!-- What are the changes this PR brings about? -->
 <!-- Example: This PR adds a PR template to the repo. -->

diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,5 +1,5 @@
 {
   "sdk/zksync-rs": "0.4.0",
-  "core": "16.2.0",
-  "prover": "7.2.0"
+  "core": "17.1.0",
+  "prover": "8.1.0"
 }
diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml
@@ -82,8 +82,10 @@ jobs:
           DOCKER_ACTION: ${{ inputs.action }}
           COMPONENT: ${{ matrix.component }}
         run: |
+          ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+          ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev -q
+          ci_run rustup default nightly-2023-07-21
           ci_run zk docker $DOCKER_ACTION $COMPONENT -- --public
-
       - name: Show sccache stats
         if: always()
         run: |

diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml
@@ -25,6 +25,8 @@ jobs:
     runs-on: [ubuntu-latest]
     outputs:
       image_tag_suffix: ${{ steps.set.outputs.image_tag_suffix }}
+      prover_fri_cpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.cpu_short_commit_sha }}
+      prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }}
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
@@ -42,6 +44,20 @@ jobs:
           version=$(cut -d "-" -f2 <<< ${git_tag})
           echo "image_tag_suffix=${version}" >> $GITHUB_OUTPUT
 
+      - name: Generate outputs with Prover FRI setup data keys IDs
+        id: extract-prover-fri-setup-key-ids
+        run: |
+          declare -A json_files=(
+            ["cpu"]="setup-data-cpu-keys.json"
+            ["gpu"]="setup-data-gpu-keys.json"
+          )
+          for type in "${!json_files[@]}"; do
+            file=${json_files[$type]}
+            value=$(jq -r '.us' "./prover/$file")
+            short_sha=$(echo $value | sed 's|gs://matterlabs-setup-data-us/\(.*\)/|\1|')
+            echo "${type}_short_commit_sha=$short_sha" >> $GITHUB_OUTPUT
+          done
+
   build-push-core-images:
     name: Build and push image
     needs: [setup]
@@ -73,7 +89,7 @@ jobs:
     uses: ./.github/workflows/build-gar-reusable.yml
     if: contains(github.ref_name, 'prover')
     with:
-      setup_keys_id: 4989f12
+      setup_keys_id: bccc7de
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       push_asia: true
       push_europe: true
@@ -84,5 +100,5 @@ jobs:
     uses: ./.github/workflows/build-prover-fri-gpu-gar.yml
     if: contains(github.ref_name, 'prover')
     with:
-      setup_keys_id: 2d33a27-gpu
+      setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
diff --git a/.github/workflows/build-prover-fri-gpu-gar.yml b/.github/workflows/build-prover-fri-gpu-gar.yml
@@ -23,7 +23,7 @@ jobs:
 
       - name: Download Setup data
         run: |
-          gsutil -m rsync -r gs://matterlabs-zksync-v2-infra-blob-store/prover_setup_data/${{ inputs.setup_keys_id }} docker/prover-gpu-fri-gar
+          gsutil -m rsync -r gs://matterlabs-setup-data-us/${{ inputs.setup_keys_id }} docker/prover-gpu-fri-gar
 
       - name: Login to us-central1 GAR
         run: |

diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
@@ -106,7 +106,8 @@ jobs:
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
           echo IN_DOCKER=1 >> .env
-          echo RUN_CONTRACT_VERIFICATION_TEST=true >> .env
+          # TODO (EVM-374): Change the following to `true` after https://github.com/NomicFoundation/hardhat/pull/4552 is merged and released.
+          echo RUN_CONTRACT_VERIFICATION_TEST=false >> .env
           echo ZKSYNC_DEBUG_LOGS=true >> .env
 
       - name: Download zksolc/solc and zkvyper/vyper
@@ -204,7 +205,8 @@ jobs:
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
           echo IN_DOCKER=1 >> .env
-          echo RUN_CONTRACT_VERIFICATION_TEST=true >> .env
+          # TODO (EVM-374): Change the following to `true` after https://github.com/NomicFoundation/hardhat/pull/4552 is merged and released.
+          echo RUN_CONTRACT_VERIFICATION_TEST=false >> .env
           echo ZKSYNC_DEBUG_LOGS=true >> .env
 
       - name: Download zksolc/solc and zkvyper/vyper

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,8 @@ jobs:
             prover:
               - 'prover/**'
               - '!prover/CHANGELOG.md'
+              - '!prover/setup-data-cpu-keys.json'
+              - '!prover/setup-data-gpu-keys.json'
               - 'docker/prover*/**'
               - '.github/workflows/build-prover-template.yml'
               - '.github/workflows/ci-prover-reusable.yml'

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
diff --git a/.github/workflows/release-test-stage.yml b/.github/workflows/release-test-stage.yml
@@ -27,7 +27,8 @@ jobs:
         uses: tj-actions/changed-files@v37
         with:
           files_yaml: |
-            # If you want to exclude some files, please adjust here.
+            # TODO: make it more granular, as already implemented in CI workflow
+            # We don't want to be rebuilding and redeploying all the Docker images when eg. only document have changed
             prover:
               - prover/**
             core:
@@ -40,6 +41,8 @@ jobs:
     runs-on: [matterlabs-deployer-stage]
     outputs:
       image_tag_suffix: ${{ steps.generate-tag-suffix.outputs.image_tag_suffix }}
+      prover_fri_cpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.cpu_short_commit_sha }}
+      prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }}
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
@@ -52,6 +55,20 @@ jobs:
           ts=$(date +%s%N | cut -b1-13)
           echo "image_tag_suffix=${sha}-${ts}" >> $GITHUB_OUTPUT
 
+      - name: Generate outputs with Prover FRI setup data keys IDs
+        id: extract-prover-fri-setup-key-ids
+        run: |
+          declare -A json_files=(
+            ["cpu"]="setup-data-cpu-keys.json"
+            ["gpu"]="setup-data-gpu-keys.json"
+          )
+          for type in "${!json_files[@]}"; do
+            file=${json_files[$type]}
+            value=$(jq -r '.us' "./prover/$file")
+            short_sha=$(echo $value | sed 's|gs://matterlabs-setup-data-us/\(.*\)/|\1|')
+            echo "${type}_short_commit_sha=$short_sha" >> $GITHUB_OUTPUT
+          done
+
   build-push-core-images:
     name: Build and push images
     needs: [setup, changed_files]
@@ -83,7 +100,7 @@ jobs:
     uses: ./.github/workflows/build-gar-reusable.yml
     if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
     with:
-      setup_keys_id: 4989f12
+      setup_keys_id: bccc7de
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       push_asia: false
       push_europe: false
@@ -94,5 +111,5 @@ jobs:
     uses: ./.github/workflows/build-prover-fri-gpu-gar.yml
     if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
     with:
-      setup_keys_id: 2d33a27-gpu
+      setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
diff --git a/.markdownlintignore b/.markdownlintignore
@@ -1,2 +1,11 @@
 # Ignore submodule
 bellman-cuda
+
+
+# Ignore Github configuration markdowns
+.github
+
+# Ignore contract submodules
+contracts
+etc/system-contracts
+
diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,7 @@
 bellman-cuda
 sdk/zksync-rs/CHANGELOG.md
 CHANGELOG.md
+
+# Ignore contract submodules
+contracts
+etc/system-contracts
diff --git a/.solhintignore b/.solhintignore
@@ -0,0 +1,3 @@
+# Ignore contract submodules
+contracts
+etc/system-contracts
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ There are many ways to contribute to the ZK Stack:
    issues.
 3. Resolve issues: either by showing an issue isn't a problem and the current state is ok as is or by fixing the problem
    and opening a PR.
-4. Report security issues, see [our security policy](./github/SECURITY.md).
+4. Report security issues, see [our security policy](./SECURITY.md).
 5. [Join the team!](https://matterlabs.notion.site/Shape-the-future-of-Ethereum-at-Matter-Labs-dfb3b5a037044bb3a8006af2eb0575e0)
 
 ## Fixing issues