Merge pull request #5 from matter-labs/merge-main-to-sync-layer

feat: merge main to sync layer

.github/workflows/build-tee-prover-template.yml

@@ -76,4 +76,3 @@ jobs:
               docker push "${repo}/${tag}"
             done
           done
-

.github/workflows/ci-common-reusable.yml

@@ -28,7 +28,7 @@ jobs:
         run: |
           run_retried docker-compose -f ${RUNNER_COMPOSE_FILE} pull
           docker-compose -f ${RUNNER_COMPOSE_FILE} up --build -d zk postgres
-      
+
       - name: Install zkstack
         run: |
           ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup
@@ -38,4 +38,3 @@ jobs:
       # `zk lint prover` = cargo clippy, which does cargo check behind the scenes, which is a lightweight version of cargo build
       - name: Lints
         run: ci_run zkstack dev lint -t rs --check
-

.github/workflows/ci-core-reusable.yml

@@ -400,10 +400,17 @@ jobs:
         run: |
           ci_run zkstack dev test build
 
+      - name: Build tested binaries
+        run: |
+          ci_run zkstack server build
+          ci_run zkstack external-node build
+          ci_run zkstack contract-verifier build
+
       - name: Initialize Contract verifier
         run: |
           ci_run zkstack contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.26-1.0.1 --only --chain era
           ci_run zkstack contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
+          ci_run zkstack contract-verifier wait --chain era --verbose
 
       - name: Run servers
         run: |
@@ -418,10 +425,14 @@ jobs:
             --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher,consensus \
             &> ${{ env.SERVER_LOGS_DIR }}/consensus.log &
 
-          ci_run sleep 5
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain era
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain validium
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain custom_token
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain consensus
 
-      - name: Setup attester committee for the consensus chain
+      - name: Set up attester committee for the consensus chain
         run: |
+          ci_run zkstack consensus wait-for-registry --ignore-prerequisites --verbose --chain consensus
           ci_run zkstack consensus set-attester-committee --chain consensus --from-genesis &> ${{ env.INTEGRATION_TESTS_LOGS_DIR }}/consensus.log 
 
       - name: Run integration tests
@@ -461,6 +472,11 @@ jobs:
 #          ci_run zkstack external-node run --ignore-prerequisites --chain custom_token &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/custom_token.log &
 #          ci_run zkstack external-node run --ignore-prerequisites --chain consensus --enable-consensus &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/consensus.log &
 #
+#          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain era
+#          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain validium
+#          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain custom_token
+#          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain consensus
+#
 #      - name: Run integration tests en
 #        run: |
 #          ci_run ./bin/run_on_all_chains.sh "zkstack dev test integration --no-deps --ignore-prerequisites --external-node" ${{ env.CHAINS }} ${{ env.INTEGRATION_TESTS_LOGS_DIR }}
@@ -484,7 +500,6 @@ jobs:
 #        run: |
 #          ci_run zkstack dev test upgrade --no-deps --chain era
 
-
       - name: Upload logs
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: always()

.github/workflows/new-build-core-template.yml

@@ -187,7 +187,11 @@ jobs:
       - name: Download setup key
         shell: bash
         run: |
-          run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+          if [ -f "/setup_2^26.key" ]; then
+            cp '/setup_2^26.key' './setup_2^26.key'
+          else
+            run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+          fi
 
       - name: Set env vars
         shell: bash

.github/workflows/new-build-prover-template.yml

@@ -127,7 +127,6 @@ jobs:
         if: matrix.components == 'proof-fri-gpu-compressor'
         run: |
           run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^24.key
-
       # 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

.github/workflows/secrets_scanner.yaml

@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: TruffleHog OSS
-        uses: trufflesecurity/trufflehog@0c66d30c1f4075cee1aada2e1ab46dabb1b0071a
+        uses: trufflesecurity/trufflehog@781157ae368b2218a0a56b889387dd26faa20f97
         with:
           path: ./
           base: ${{ github.event.repository.default_branch }}

Cargo.toml

@@ -130,6 +130,7 @@ google-cloud-storage = "0.20.0"
 governor = "0.4.2"
 hex = "0.4"
 http = "1.1"
+http-body-util = "0.1.2"
 httpmock = "0.7.0"
 hyper = "1.3"
 insta = "1.29.0"

bin/run_loadtest_from_github_actions

@@ -11,11 +11,12 @@ export TRANSACTION_WEIGHTS_WITHDRAWAL=${weights[3]}
 
 read -ra execution_params <<<"$CONTRACT_EXECUTION_PARAMS" #reading $CONTRACT_EXECUTION_PARAMS as an array as tokens separated by IFS
 export CONTRACT_EXECUTION_PARAMS_READS=${execution_params[0]}
-export CONTRACT_EXECUTION_PARAMS_WRITES=${execution_params[1]}
-export CONTRACT_EXECUTION_PARAMS_EVENTS=${execution_params[2]}
-export CONTRACT_EXECUTION_PARAMS_HASHES=${execution_params[3]}
-export CONTRACT_EXECUTION_PARAMS_RECURSIVE_CALLS=${execution_params[4]}
-export CONTRACT_EXECUTION_PARAMS_DEPLOYS=${execution_params[5]}
+export CONTRACT_EXECUTION_PARAMS_INITIAL_WRITES=${execution_params[1]}
+export CONTRACT_EXECUTION_PARAMS_REPEATED_WRITES=${execution_params[2]}
+export CONTRACT_EXECUTION_PARAMS_EVENTS=${execution_params[3]}
+export CONTRACT_EXECUTION_PARAMS_HASHES=${execution_params[4]}
+export CONTRACT_EXECUTION_PARAMS_RECURSIVE_CALLS=${execution_params[5]}
+export CONTRACT_EXECUTION_PARAMS_DEPLOYS=${execution_params[6]}
 
 # Run the test
 cargo run --bin loadnext

core/bin/contract-verifier/Cargo.toml

@@ -12,7 +12,6 @@ publish = false
 
 [dependencies]
 zksync_dal.workspace = true
-zksync_env_config.workspace = true
 zksync_config = { workspace = true, features = ["observability_ext"] }
 zksync_contract_verifier_lib.workspace = true
 zksync_queued_job_processor.workspace = true
@@ -21,8 +20,6 @@ zksync_vlog.workspace = true
 zksync_core_leftovers.workspace = true
 
 anyhow.workspace = true
+clap = { workspace = true, features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
-futures.workspace = true
-ctrlc.workspace = true
-structopt.workspace = true
 tracing.workspace = true