From af17e9b0ada85951d66096fe513f73134df4592a Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Wed, 18 Dec 2024 13:29:39 +0100 Subject: [PATCH 1/2] feat: Migrate back to public repo (#34) --- .github/workflows/build-base.yml | 1 - .../build-contract-verifier-template.yml | 4 ---- .github/workflows/build-core-template.yml | 6 ------ .github/workflows/build-docker-from-tag.yml | 17 ----------------- .github/workflows/build-local-node-docker.yml | 1 - ...-fri-gpu-gar-and-circuit-prover-gpu-gar.yml | 4 ---- .github/workflows/build-prover-template.yml | 4 ---- .github/workflows/build-runtime-base.yml | 1 - .../workflows/build-tee-prover-template.yml | 6 ------ .../build-witness-generator-template.yml | 4 ---- .github/workflows/ci-common-reusable.yml | 5 ----- .github/workflows/ci-core-lint-reusable.yml | 5 ----- .github/workflows/ci-core-reusable.yml | 9 --------- .github/workflows/ci-docs-reusable.yml | 5 ----- .github/workflows/ci-prover-e2e.yml | 5 ----- .github/workflows/ci-prover-reusable.yml | 6 ------ .github/workflows/ci.yml | 18 ------------------ .../new-build-contract-verifier-template.yml | 7 ------- .github/workflows/new-build-core-template.yml | 7 ------- .../workflows/new-build-prover-template.yml | 5 ----- .../new-build-witness-generator-template.yml | 5 ----- .github/workflows/protobuf.yaml | 2 -- .../workflows/release-please-cargo-lock.yml | 1 - .github/workflows/release-test-stage.yml | 8 -------- .github/workflows/vm-perf-comparison.yml | 1 - .github/workflows/vm-perf-to-prometheus.yml | 1 - .github/workflows/zk-environment-publish.yml | 3 --- .gitmodules | 2 +- contracts | 2 +- 29 files changed, 2 insertions(+), 143 deletions(-) diff --git a/.github/workflows/build-base.yml b/.github/workflows/build-base.yml index d1d235e386bf..83be44c126f9 100644 --- a/.github/workflows/build-base.yml +++ b/.github/workflows/build-base.yml @@ -29,7 +29,6 @@ jobs: steps: - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Login to google container registry diff --git a/.github/workflows/build-contract-verifier-template.yml b/.github/workflows/build-contract-verifier-template.yml index b5453e4becba..1481e542de57 100644 --- a/.github/workflows/build-contract-verifier-template.yml +++ b/.github/workflows/build-contract-verifier-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: image_tag_suffix: description: "Optional suffix to override tag name generation" @@ -43,7 +40,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml index 2fa77157f4d9..15d4432191dd 100644 --- a/.github/workflows/build-core-template.yml +++ b/.github/workflows/build-core-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: image_tag_suffix: description: "Optional suffix to override tag name generation" @@ -52,7 +49,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env @@ -185,8 +181,6 @@ jobs: IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.component.name == 'external-node') && '-alpha' || '' }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: login to Docker registries run: | diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml index ab2c697e1dae..e48539c90738 100644 --- a/.github/workflows/build-docker-from-tag.yml +++ b/.github/workflows/build-docker-from-tag.yml @@ -1,10 +1,6 @@ name: Build Image from tag on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: tag_name: description: "Tag of an image to built" @@ -16,10 +12,6 @@ on: description: "Tag of an image to built" type: string required: true - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true push: tags: - core-v** @@ -37,8 +29,6 @@ jobs: prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: Generate output with git tag id: set run: | @@ -64,7 +54,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} en_alpha_release: true @@ -79,7 +68,6 @@ jobs: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} @@ -91,7 +79,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} with: image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} action: "push" @@ -108,7 +95,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-push-witness-generator-image-avx512: name: Build and push image @@ -123,7 +109,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-gar-prover-fri-gpu-and-circuit-prover-gpu-gar: name: Build GAR prover FRI GPU @@ -134,5 +119,3 @@ jobs: setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }} image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} protocol_version: ${{ needs.build-push-prover-images.outputs.protocol_version }} - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} diff --git a/.github/workflows/build-local-node-docker.yml b/.github/workflows/build-local-node-docker.yml index 1fea7d6bc5ab..cbb4239b5725 100644 --- a/.github/workflows/build-local-node-docker.yml +++ b/.github/workflows/build-local-node-docker.yml @@ -20,7 +20,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env diff --git a/.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml b/.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml index a3642d514357..d790d285a6eb 100644 --- a/.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml +++ b/.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml @@ -3,9 +3,6 @@ name: Build Prover FRI GPU & Circuit Prover GPU with builtin setup data on: workflow_call: secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: image_tag_suffix: description: "Commit sha or git tag for Docker tag" @@ -27,7 +24,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Download Setup data diff --git a/.github/workflows/build-prover-template.yml b/.github/workflows/build-prover-template.yml index d0de1eb15b45..762ec496943c 100644 --- a/.github/workflows/build-prover-template.yml +++ b/.github/workflows/build-prover-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: ERA_BELLMAN_CUDA_RELEASE: description: "ERA_BELLMAN_CUDA_RELEASE" @@ -65,7 +62,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env diff --git a/.github/workflows/build-runtime-base.yml b/.github/workflows/build-runtime-base.yml index 7b5ae0241220..eaec05bc6bcf 100644 --- a/.github/workflows/build-runtime-base.yml +++ b/.github/workflows/build-runtime-base.yml @@ -26,7 +26,6 @@ jobs: steps: - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Login to google container registry diff --git a/.github/workflows/build-tee-prover-template.yml b/.github/workflows/build-tee-prover-template.yml index 9b4eed3f23ed..c55e06931247 100644 --- a/.github/workflows/build-tee-prover-template.yml +++ b/.github/workflows/build-tee-prover-template.yml @@ -11,9 +11,6 @@ on: ATTIC_TOKEN: description: "ATTIC_TOKEN" required: false - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: image_tag_suffix: description: "Optional suffix to override tag name generation" @@ -35,12 +32,9 @@ jobs: if: ${{ github.event_name == 'workflow_dispatch' }} with: ref: ${{ github.event.inputs.target_branch }} - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 if: ${{ github.event_name != 'workflow_dispatch' }} - with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 with: diff --git a/.github/workflows/build-witness-generator-template.yml b/.github/workflows/build-witness-generator-template.yml index 9cd2d2949425..95053b89d3d8 100644 --- a/.github/workflows/build-witness-generator-template.yml +++ b/.github/workflows/build-witness-generator-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: ERA_BELLMAN_CUDA_RELEASE: description: "ERA_BELLMAN_CUDA_RELEASE" @@ -59,7 +56,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env diff --git a/.github/workflows/ci-common-reusable.yml b/.github/workflows/ci-common-reusable.yml index ca50df147307..d57630d3029a 100644 --- a/.github/workflows/ci-common-reusable.yml +++ b/.github/workflows/ci-common-reusable.yml @@ -1,10 +1,6 @@ name: Workflow template for CI jobs to be ran on both Prover and Core Components on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true jobs: build: @@ -15,7 +11,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Setup environment diff --git a/.github/workflows/ci-core-lint-reusable.yml b/.github/workflows/ci-core-lint-reusable.yml index 4aee2d253d99..0d4db601c467 100644 --- a/.github/workflows/ci-core-lint-reusable.yml +++ b/.github/workflows/ci-core-lint-reusable.yml @@ -1,10 +1,6 @@ name: Workflow template for Core Linting CI jobs on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true jobs: code_lint: @@ -12,7 +8,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Setup environment diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml index f09a1077241f..9aa7995607f8 100644 --- a/.github/workflows/ci-core-reusable.yml +++ b/.github/workflows/ci-core-reusable.yml @@ -1,10 +1,6 @@ name: Workflow template for CI jobs for Core Components on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: compilers: description: "JSON of required compilers and their versions" @@ -20,15 +16,12 @@ jobs: lint: name: lint uses: ./.github/workflows/ci-core-lint-reusable.yml - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} unit-tests: runs-on: [ matterlabs-ci-runner-highmem-long ] steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" fetch-depth: 0 @@ -101,7 +94,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" fetch-depth: 0 @@ -185,7 +177,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" fetch-depth: 0 diff --git a/.github/workflows/ci-docs-reusable.yml b/.github/workflows/ci-docs-reusable.yml index 971a78a97d67..e1a9cf78df7d 100644 --- a/.github/workflows/ci-docs-reusable.yml +++ b/.github/workflows/ci-docs-reusable.yml @@ -1,10 +1,6 @@ name: Workflow template for CI jobs against docs on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true jobs: lint: @@ -14,7 +10,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Setup environment diff --git a/.github/workflows/ci-prover-e2e.yml b/.github/workflows/ci-prover-e2e.yml index 38d317f4fc66..e9df4d86c093 100644 --- a/.github/workflows/ci-prover-e2e.yml +++ b/.github/workflows/ci-prover-e2e.yml @@ -1,10 +1,6 @@ name: Workflow for testing prover component end-to-end on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true jobs: e2e-test: @@ -15,7 +11,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" fetch-depth: 0 diff --git a/.github/workflows/ci-prover-reusable.yml b/.github/workflows/ci-prover-reusable.yml index 1773e44b2685..26679cb2232f 100644 --- a/.github/workflows/ci-prover-reusable.yml +++ b/.github/workflows/ci-prover-reusable.yml @@ -1,10 +1,6 @@ name: Workflow template for CI jobs for Prover Components on: workflow_call: - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true jobs: lint: @@ -15,7 +11,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Setup environment @@ -57,7 +52,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Setup environment diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0377bbb0692c..7d68fb91710f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,6 @@ jobs: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} fetch-depth: 2 submodules: "recursive" @@ -88,40 +87,30 @@ jobs: needs: changed_files if: contains(github.ref_name, 'release-please--branches') uses: ./.github/workflows/ci-core-lint-reusable.yml - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ci-for-core: name: CI for Core Components needs: changed_files if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }} uses: ./.github/workflows/ci-core-reusable.yml - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ci-for-prover: needs: changed_files if: ${{ (needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }} name: CI for Prover Components uses: ./.github/workflows/ci-prover-reusable.yml - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} # e2e-for-prover: # name: E2E Test for Prover Components # needs: changed_files # if: ${{(needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }} # uses: ./.github/workflows/ci-prover-e2e.yml -# secrets: -# ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ci-for-docs: needs: changed_files if: needs.changed_files.outputs.docs == 'true' name: CI for Docs uses: ./.github/workflows/ci-docs-reusable.yml - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} # What needs to be ran for both core and prover ci-for-common: @@ -129,8 +118,6 @@ jobs: if: ${{ (needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }} name: CI for Common Components (prover or core) uses: ./.github/workflows/ci-common-reusable.yml - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-core-images: name: Build core images @@ -143,7 +130,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-tee-prover-images: name: Build TEE Prover images @@ -157,7 +143,6 @@ jobs: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-contract-verifier: name: Build contract verifier @@ -170,7 +155,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-prover-images: name: Build prover images @@ -185,7 +169,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-witness-generator-image-avx512: name: Build prover images with avx512 instructions @@ -200,7 +183,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ci-success: name: Github Status Check diff --git a/.github/workflows/new-build-contract-verifier-template.yml b/.github/workflows/new-build-contract-verifier-template.yml index 8e35160e47ef..95d32affda16 100644 --- a/.github/workflows/new-build-contract-verifier-template.yml +++ b/.github/workflows/new-build-contract-verifier-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: image_tag_suffix: description: "Optional suffix to override tag name generation" @@ -33,7 +30,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Prepare ENV @@ -163,7 +159,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Set up Docker Buildx @@ -252,8 +247,6 @@ jobs: IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: login to Docker registries run: | diff --git a/.github/workflows/new-build-core-template.yml b/.github/workflows/new-build-core-template.yml index 9627588b2a16..146868a34461 100644 --- a/.github/workflows/new-build-core-template.yml +++ b/.github/workflows/new-build-core-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: image_tag_suffix: description: "Optional suffix to override tag name generation" @@ -38,7 +35,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Prepare ENV @@ -174,7 +170,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Set up Docker Buildx @@ -263,8 +258,6 @@ jobs: IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.component.name == 'external-node') && '-alpha' || '' }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: login to Docker registries run: | diff --git a/.github/workflows/new-build-prover-template.yml b/.github/workflows/new-build-prover-template.yml index 3574b91033ae..3a721e4425a8 100644 --- a/.github/workflows/new-build-prover-template.yml +++ b/.github/workflows/new-build-prover-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: ERA_BELLMAN_CUDA_RELEASE: description: "ERA_BELLMAN_CUDA_RELEASE" @@ -53,7 +50,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env @@ -109,7 +105,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Set up Docker Buildx diff --git a/.github/workflows/new-build-witness-generator-template.yml b/.github/workflows/new-build-witness-generator-template.yml index e2d3f87994cc..a96d217da832 100644 --- a/.github/workflows/new-build-witness-generator-template.yml +++ b/.github/workflows/new-build-witness-generator-template.yml @@ -8,9 +8,6 @@ on: DOCKERHUB_TOKEN: description: "DOCKERHUB_TOKEN" required: true - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: - description: "Token which will be provided to checkout action to be able to clone private submodules" - required: true inputs: ERA_BELLMAN_CUDA_RELEASE: description: "ERA_BELLMAN_CUDA_RELEASE" @@ -43,7 +40,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env @@ -92,7 +88,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env diff --git a/.github/workflows/protobuf.yaml b/.github/workflows/protobuf.yaml index 6d43ebd79086..f0565919ded1 100644 --- a/.github/workflows/protobuf.yaml +++ b/.github/workflows/protobuf.yaml @@ -40,7 +40,6 @@ jobs: with: ref: ${{ env.BASE }} path: before - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} fetch-depth: 0 # fetches all branches and tags, which is needed to compute the LCA. submodules: "recursive" - name: checkout LCA @@ -61,7 +60,6 @@ jobs: with: ref: ${{ env.HEAD }} path: after - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: recursive - name: compile after run: cargo check --all-targets diff --git a/.github/workflows/release-please-cargo-lock.yml b/.github/workflows/release-please-cargo-lock.yml index fceab6198111..8c8036dfa47a 100644 --- a/.github/workflows/release-please-cargo-lock.yml +++ b/.github/workflows/release-please-cargo-lock.yml @@ -12,7 +12,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" persist-credentials: false diff --git a/.github/workflows/release-test-stage.yml b/.github/workflows/release-test-stage.yml index db6cb72eca58..2e6c7882aa98 100644 --- a/.github/workflows/release-test-stage.yml +++ b/.github/workflows/release-test-stage.yml @@ -19,7 +19,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} fetch-depth: 2 - name: Get all test, doc and src files that have changed @@ -70,7 +69,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-push-tee-prover-images: name: Build and push images @@ -83,7 +81,6 @@ jobs: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-push-contract-verifier: name: Build and push images @@ -96,7 +93,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-push-prover-images: name: Build and push images @@ -110,7 +106,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-push-witness-generator-image-avx512: name: Build and push prover images with avx512 instructions @@ -125,7 +120,6 @@ jobs: secrets: DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} build-gar-prover-fri-gpu-and-circuit-prover-gpu-gar: name: Build GAR prover FRI GPU @@ -136,5 +130,3 @@ jobs: setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }} image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} protocol_version: ${{ needs.build-push-prover-images.outputs.protocol_version }} - secrets: - ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} diff --git a/.github/workflows/vm-perf-comparison.yml b/.github/workflows/vm-perf-comparison.yml index 2bf31dd8f1e7..f33554d3a9cc 100644 --- a/.github/workflows/vm-perf-comparison.yml +++ b/.github/workflows/vm-perf-comparison.yml @@ -17,7 +17,6 @@ jobs: submodules: "recursive" fetch-depth: 0 ref: ${{ github.base_ref }} - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: fetch PR branch run: | diff --git a/.github/workflows/vm-perf-to-prometheus.yml b/.github/workflows/vm-perf-to-prometheus.yml index 4eabf3a46310..93d33116794f 100644 --- a/.github/workflows/vm-perf-to-prometheus.yml +++ b/.github/workflows/vm-perf-to-prometheus.yml @@ -17,7 +17,6 @@ jobs: steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: setup-env diff --git a/.github/workflows/zk-environment-publish.yml b/.github/workflows/zk-environment-publish.yml index f454ae482b2e..e9dfac1c6bb2 100644 --- a/.github/workflows/zk-environment-publish.yml +++ b/.github/workflows/zk-environment-publish.yml @@ -38,7 +38,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Get changed files @@ -65,7 +64,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Set short SHA id: set_short_sha @@ -92,7 +90,6 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} submodules: "recursive" - name: Set up Docker Buildx uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0 diff --git a/.gitmodules b/.gitmodules index dd5b3b3bc821..445344c3f204 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "contracts"] path = contracts -url = https://github.com/matter-labs/era-contracts-private.git +url = https://github.com/matter-labs/era-contracts.git diff --git a/contracts b/contracts index 68ddadf8106b..349ba7cbc134 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 68ddadf8106bde020368e6ab5613a522a88f58f6 +Subproject commit 349ba7cbc134ab6f6309d91cd777a0be5733f38c From 05ad8a0066858286674ce1d06d24d847be58595e Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Thu, 19 Dec 2024 13:02:28 +0100 Subject: [PATCH 2/2] fix lint/tests --- core/lib/env_config/src/eth_sender.rs | 2 +- .../protobuf_config/src/proto/config/genesis.proto | 1 - core/node/eth_watch/src/tests/mod.rs | 14 +++++++------- .../zkstack/src/commands/chain/gateway_upgrade.rs | 2 -- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/core/lib/env_config/src/eth_sender.rs b/core/lib/env_config/src/eth_sender.rs index 498aa29e28c3..b39bfcf3f74b 100644 --- a/core/lib/env_config/src/eth_sender.rs +++ b/core/lib/env_config/src/eth_sender.rs @@ -122,7 +122,7 @@ mod tests { ETH_SENDER_GAS_ADJUSTER_MAX_BASE_FEE_SAMPLES="10000" ETH_SENDER_GAS_ADJUSTER_PRICING_FORMULA_PARAMETER_A="1.5" ETH_SENDER_GAS_ADJUSTER_PRICING_FORMULA_PARAMETER_B="1.0005" - ETH_SENDER_GAS_ADJUSTER_INTERNAL_SL_PRICING_MULTIPLIER="0.8" + ETH_SENDER_GAS_ADJUSTER_INTERNAL_L1_PRICING_MULTIPLIER="0.8" ETH_SENDER_GAS_ADJUSTER_POLL_PERIOD="15" ETH_SENDER_GAS_ADJUSTER_MAX_L1_GAS_PRICE="100000000" ETH_SENDER_GAS_ADJUSTER_MAX_BLOB_BASE_FEE_SAMPLES="10" diff --git a/core/lib/protobuf_config/src/proto/config/genesis.proto b/core/lib/protobuf_config/src/proto/config/genesis.proto index 808bcee4799b..2e9ebc82f25e 100644 --- a/core/lib/protobuf_config/src/proto/config/genesis.proto +++ b/core/lib/protobuf_config/src/proto/config/genesis.proto @@ -31,5 +31,4 @@ message Genesis { optional string evm_emulator_hash = 13; // optional; h256 optional string custom_genesis_state_path = 14; // optional; reserved 11; reserved "shared_bridge"; - reserved 15; reserved "sl_chain_id"; } diff --git a/core/node/eth_watch/src/tests/mod.rs b/core/node/eth_watch/src/tests/mod.rs index 7a81cede8776..d8c8bf7de12c 100644 --- a/core/node/eth_watch/src/tests/mod.rs +++ b/core/node/eth_watch/src/tests/mod.rs @@ -503,7 +503,7 @@ async fn test_batch_root_processor_from_genesis() { .await .unwrap() .unwrap(); - let proof1 = hex::encode(&bincode::serialize(&proof1).unwrap()); + let proof1 = hex::encode(bincode::serialize(&proof1).unwrap()); assert_eq!(proof1, "000000000600000000000000420000000000000030783030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303030303030303030303030303030303030303030303030303030303030303530303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307833373561356266393039636230323134336533363935636136353865303634316537333961613539306630303034646261393335373263343463646239643264"); sl_client.set_last_finalized_block_number(11).await; @@ -515,7 +515,7 @@ async fn test_batch_root_processor_from_genesis() { .await .unwrap() .unwrap(); - let proof2 = hex::encode(&bincode::serialize(&proof2).unwrap()); + let proof2 = hex::encode(bincode::serialize(&proof2).unwrap()); assert_eq!(proof2, "0100000007000000000000004200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303031420000000000000030783130613265663736653730396433313862343539626534396631653864376630326437313230663262353031626330616664646439333566316138313363363742000000000000003078303030303030303030303030303030303030303030303030303030303030303930303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307861333738613230636132376237616533303731643162643763326164613030343639616263353765343239646436663438613833303932646237303539613138"); let proof3 = connection @@ -524,7 +524,7 @@ async fn test_batch_root_processor_from_genesis() { .await .unwrap() .unwrap(); - let proof3 = hex::encode(&bincode::serialize(&proof3).unwrap()); + let proof3 = hex::encode(bincode::serialize(&proof3).unwrap()); assert_eq!(proof3, "02000000080000000000000042000000000000003078303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030324200000000000000307834363730306234643430616335633335616632633232646461323738376139316562353637623036633932346138666238616539613035623230633038633231420000000000000030786530633333333066363734623662326435373866393538613164626436366631363464303638623062623561396662303737656361303133393736666461366642000000000000003078303030303030303030303030303030303030303030303030303030303030306230303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307833373561356266393039636230323134336533363935636136353865303634316537333961613539306630303034646261393335373263343463646239643264"); } @@ -590,7 +590,7 @@ async fn test_batch_root_processor_restart() { .await .unwrap() .unwrap(); - let proof = hex::encode(&bincode::serialize(&proof).unwrap()); + let proof = hex::encode(bincode::serialize(&proof).unwrap()); assert_eq!(proof, "02000000080000000000000042000000000000003078303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030324200000000000000307834363730306234643430616335633335616632633232646461323738376139316562353637623036633932346138666238616539613035623230633038633231420000000000000030786530633333333066363734623662326435373866393538613164626436366631363464303638623062623561396662303737656361303133393736666461366642000000000000003078303030303030303030303030303030303030303030303030303030303030306230303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307833373561356266393039636230323134336533363935636136353865303634316537333961613539306630303034646261393335373263343463646239643264"); let proof = connection @@ -599,7 +599,7 @@ async fn test_batch_root_processor_restart() { .await .unwrap() .unwrap(); - let proof = hex::encode(&bincode::serialize(&proof).unwrap()); + let proof = hex::encode(bincode::serialize(&proof).unwrap()); assert_eq!(proof, "02000000080000000000000042000000000000003078303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030334200000000000000307837623765373735373139343639366666393634616233353837393131373362636337663735356132656161393334653935373061636533393139383435313265420000000000000030786530633333333066363734623662326435373866393538613164626436366631363464303638623062623561396662303737656361303133393736666461366642000000000000003078303030303030303030303030303030303030303030303030303030303030306430303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307835353063313735316338653764626166633839303939326634353532333636663064643565623665343362653535353936386264616338633732656466316261"); let proof = connection @@ -608,7 +608,7 @@ async fn test_batch_root_processor_restart() { .await .unwrap() .unwrap(); - let proof = hex::encode(&bincode::serialize(&proof).unwrap()); + let proof = hex::encode(bincode::serialize(&proof).unwrap()); assert_eq!(proof, "030000000900000000000000420000000000000030783030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303442000000000000003078303235663065363031353230366661626364326263613930316432633438396536336263356564346231356266356330633963363066396531363735383564614200000000000000307863633463343165646230633230333133343862323932623736386539626163316565386339326330396566386133323737633265636534303963313264383661420000000000000030783533656463316635616437396335393939626435373864666331333566396335316562643766616661343538356236346637316431356232646365316237323842000000000000003078303030303030303030303030303030303030303030303030303030303030306530303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307833373561356266393039636230323134336533363935636136353865303634316537333961613539306630303034646261393335373263343463646239643264"); let proof = connection @@ -617,7 +617,7 @@ async fn test_batch_root_processor_restart() { .await .unwrap() .unwrap(); - let proof = hex::encode(&bincode::serialize(&proof).unwrap()); + let proof = hex::encode(bincode::serialize(&proof).unwrap()); assert_eq!(proof, "030000000900000000000000420000000000000030783030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303542000000000000003078323465653435363834376535373364313635613832333634306632303834383139636331613865333433316562633635633865363064333435343266313637324200000000000000307863633463343165646230633230333133343862323932623736386539626163316565386339326330396566386133323737633265636534303963313264383661420000000000000030783533656463316635616437396335393939626435373864666331333566396335316562643766616661343538356236346637316431356232646365316237323842000000000000003078303030303030303030303030303030303030303030303030303030303030306530303030303030303030303030303030303030303030303030303030303030334200000000000000307830303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030316639420000000000000030783031303230303031303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303042000000000000003078303932343932386331333737613663663234633339633264343666386562396466323365383131623236646333353237653534383339366664346531373362314200000000000000307833373561356266393039636230323134336533363935636136353865303634316537333961613539306630303034646261393335373263343463646239643264"); } diff --git a/zkstack_cli/crates/zkstack/src/commands/chain/gateway_upgrade.rs b/zkstack_cli/crates/zkstack/src/commands/chain/gateway_upgrade.rs index 453bc0fc1822..44cc34572bb6 100644 --- a/zkstack_cli/crates/zkstack/src/commands/chain/gateway_upgrade.rs +++ b/zkstack_cli/crates/zkstack/src/commands/chain/gateway_upgrade.rs @@ -1,5 +1,3 @@ -use std::io::Write; - use anyhow::Context; use clap::{Parser, ValueEnum}; use common::{