forked from matter-labs/zksync-era
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'matter-labs:main' into main
- Loading branch information
Showing
990 changed files
with
21,504 additions
and
10,733 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "core": "24.16.0", | ||
| "prover": "16.3.0", | ||
| "zk_toolbox": "0.1.1" | ||
| "core": "24.23.0", | ||
| "prover": "16.5.0", | ||
| "zk_toolbox": "0.1.2" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| name: Build witness generator image with custom compiler flags | ||
| on: | ||
| workflow_call: | ||
| secrets: | ||
| DOCKERHUB_USER: | ||
| description: "DOCKERHUB_USER" | ||
| required: true | ||
| DOCKERHUB_TOKEN: | ||
| description: "DOCKERHUB_TOKEN" | ||
| required: true | ||
| inputs: | ||
| ERA_BELLMAN_CUDA_RELEASE: | ||
| description: "ERA_BELLMAN_CUDA_RELEASE" | ||
| type: string | ||
| required: true | ||
| image_tag_suffix: | ||
| description: "Optional suffix to override tag name generation" | ||
| type: string | ||
| required: false | ||
| action: | ||
| description: "Action with docker image" | ||
| type: string | ||
| default: "push" | ||
| required: false | ||
| is_pr_from_fork: | ||
| description: "Indicates whether the workflow is invoked from a PR created from fork" | ||
| type: boolean | ||
| default: false | ||
| required: false | ||
| CUDA_ARCH: | ||
| description: "CUDA Arch to build" | ||
| type: string | ||
| default: "89" | ||
| required: false | ||
| WITNESS_GENERATOR_RUST_FLAGS: | ||
| description: "Rust flags for witness_generator compilation" | ||
| type: string | ||
| default: "" | ||
| required: false | ||
| outputs: | ||
| protocol_version: | ||
| description: "Protocol version of the binary" | ||
| value: ${{ jobs.build-images.outputs.protocol_version }} | ||
|
|
||
| jobs: | ||
| build-images: | ||
| name: Build and Push Docker Images | ||
| env: | ||
| IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }} | ||
| RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml" | ||
| ERA_BELLMAN_CUDA_RELEASE: ${{ inputs.ERA_BELLMAN_CUDA_RELEASE }} | ||
| CUDA_ARCH: ${{ inputs.CUDA_ARCH }} | ||
| WITNESS_GENERATOR_RUST_FLAGS: ${{ inputs.WITNESS_GENERATOR_RUST_FLAGS }} | ||
| runs-on: [ matterlabs-ci-runner-c3d ] | ||
| strategy: | ||
| matrix: | ||
| component: | ||
| - witness-generator | ||
| outputs: | ||
| protocol_version: ${{ steps.protocolversion.outputs.protocol_version }} | ||
| steps: | ||
| - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 | ||
| with: | ||
| submodules: "recursive" | ||
|
|
||
| - name: setup-env | ||
| run: | | ||
| echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV | ||
| echo CI=1 >> $GITHUB_ENV | ||
| echo $(pwd)/bin >> $GITHUB_PATH | ||
| echo CI=1 >> .env | ||
| echo IN_DOCKER=1 >> .env | ||
| - name: start-services | ||
| run: | | ||
| echo "IMAGE_TAG_SUFFIX=${{ env.IMAGE_TAG_SUFFIX }}" >> .env | ||
| mkdir -p ./volumes/postgres | ||
| run_retried docker compose pull zk postgres | ||
| docker compose up -d zk postgres | ||
| ci_run sccache --start-server | ||
| - name: init | ||
| run: | | ||
| ci_run git config --global --add safe.directory /usr/src/zksync | ||
| ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts | ||
| ci_run git config --global --add safe.directory /usr/src/zksync/contracts | ||
| ci_run zk | ||
| - name: download CRS for GPU compressor | ||
| if: matrix.component == 'proof-fri-gpu-compressor' | ||
| run: | | ||
| ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^24.key | ||
| - name: login to Docker registries | ||
| if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) | ||
| run: | | ||
| ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }} | ||
| ci_run gcloud auth configure-docker us-docker.pkg.dev -q | ||
| # We need to run this only when ERA_BELLMAN_CUDA_RELEASE is not available | ||
| # In our case it happens only when PR is created from fork | ||
| - name: Wait for runner IP to be not rate-limited against GH API | ||
| if: inputs.is_pr_from_fork == true | ||
| run: | | ||
| api_endpoint="https://api.github.com/users/zksync-era-bot" | ||
| wait_time=60 | ||
| max_retries=60 | ||
| retry_count=0 | ||
| while [[ $retry_count -lt $max_retries ]]; do | ||
| response=$(run_retried curl -s -w "%{http_code}" -o temp.json "$api_endpoint") | ||
| http_code=$(echo "$response" | tail -n1) | ||
| if [[ "$http_code" == "200" ]]; then | ||
| echo "Request successful. Not rate-limited." | ||
| cat temp.json | ||
| rm temp.json | ||
| exit 0 | ||
| elif [[ "$http_code" == "403" ]]; then | ||
| rate_limit_exceeded=$(jq -r '.message' temp.json | grep -i "API rate limit exceeded") | ||
| if [[ -n "$rate_limit_exceeded" ]]; then | ||
| retry_count=$((retry_count+1)) | ||
| echo "API rate limit exceeded. Retry $retry_count of $max_retries. Retrying in $wait_time seconds..." | ||
| sleep $wait_time | ||
| else | ||
| echo "Request failed with HTTP status $http_code." | ||
| cat temp.json | ||
| rm temp.json | ||
| exit 1 | ||
| fi | ||
| else | ||
| echo "Request failed with HTTP status $http_code." | ||
| cat temp.json | ||
| rm temp.json | ||
| exit 1 | ||
| fi | ||
| done | ||
| echo "Reached the maximum number of retries ($max_retries). Exiting." | ||
| rm temp.json | ||
| exit 1 | ||
| - name: protocol-version | ||
| id: protocolversion | ||
| # TODO: use -C flag, when it will become stable. | ||
| shell: bash | ||
| run: | | ||
| ci_run bash -c "cd prover && cargo build --release --bin prover_version" | ||
| PPV=$(ci_run prover/target/release/prover_version) | ||
| echo Protocol version is ${PPV} | ||
| echo "protocol_version=${PPV}" >> $GITHUB_OUTPUT | ||
| echo "PROTOCOL_VERSION=${PPV}" >> $GITHUB_ENV | ||
| - name: setup-rust-flags-env | ||
| if: matrix.component == 'witness-generator' | ||
| run: | | ||
| echo RUST_FLAGS="${{ env.WITNESS_GENERATOR_RUST_FLAGS }}" >> $GITHUB_ENV | ||
| - name: update-images | ||
| env: | ||
| DOCKER_ACTION: ${{ inputs.action }} | ||
| COMPONENT: ${{ matrix.component }} | ||
| run: | | ||
| PASSED_ENV_VARS="ERA_BELLMAN_CUDA_RELEASE,CUDA_ARCH,PROTOCOL_VERSION,RUST_FLAGS" \ | ||
| ci_run zk docker $DOCKER_ACTION $COMPONENT | ||
| - name: Show sccache stats | ||
| if: always() | ||
| run: | | ||
| ci_run sccache --show-stats || true | ||
| ci_run cat /tmp/sccache_log.txt || true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.